ArmVirtPkg/ArmVirtQemu: factor out shared FV.FvMain definition

The FDF definition of [FV.FvMain] is identical between ArmVirtQemu and
ArmVirtQemuKernel, and needs to remain that way. So factor it out into
a separate include file, and replace both definitions with an !include
directive.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index d98a01cef35f27d654959b4ad737c83c59f6666b..9176cf24f105baa70024c7c1f369bef2ce421db1 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -82,159 +82,7 @@ FV = FVMAIN_COMPACT
 #\r
 ################################################################################\r
 \r
-[FV.FvMain]\r
-BlockSize          = 0x40\r
-NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
-FvAlignment        = 16        # FV alignment and FV attributes setting.\r
-ERASE_POLARITY     = 1\r
-MEMORY_MAPPED      = TRUE\r
-STICKY_WRITE       = TRUE\r
-LOCK_CAP           = TRUE\r
-LOCK_STATUS        = TRUE\r
-WRITE_DISABLED_CAP = TRUE\r
-WRITE_ENABLED_CAP  = TRUE\r
-WRITE_STATUS       = TRUE\r
-WRITE_LOCK_CAP     = TRUE\r
-WRITE_LOCK_STATUS  = TRUE\r
-READ_DISABLED_CAP  = TRUE\r
-READ_ENABLED_CAP   = TRUE\r
-READ_STATUS        = TRUE\r
-READ_LOCK_CAP      = TRUE\r
-READ_LOCK_STATUS   = TRUE\r
-\r
-  INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
-  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
-  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
-\r
-  #\r
-  # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
-  #\r
-  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
-  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
-  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
-  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
-  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
-  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
-!endif\r
-  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
-  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
-  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
-\r
-  #\r
-  # Multiple Console IO support\r
-  #\r
-  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
-  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
-  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
-  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
-\r
-  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
-  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
-  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
-\r
-  #\r
-  # FAT filesystem + GPT/MBR partitioning\r
-  #\r
-  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
-  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatPkg/EnhancedFatDxe/Fat.inf\r
-  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
-\r
-  #\r
-  # Platform Driver\r
-  #\r
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
-  INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
-  INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
-  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-\r
-  #\r
-  # UEFI application (Shell Embedded Boot Loader)\r
-  #\r
-  INF ShellPkg/Application/Shell/Shell.inf\r
-\r
-  #\r
-  # Bds\r
-  #\r
-  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
-  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
-  INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-  INF MdeModulePkg/Application/UiApp/UiApp.inf\r
-\r
-  #\r
-  # Networking stack\r
-  #\r
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-\r
-  #\r
-  # SCSI Bus and Disk Driver\r
-  #\r
-  INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
-  INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
-\r
-  #\r
-  # SMBIOS Support\r
-  #\r
-  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
-  INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
-\r
-!if $(ARCH) == AARCH64\r
-  #\r
-  # ACPI Support\r
-  #\r
-  INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-  INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
-!endif\r
-\r
-  #\r
-  # PCI support\r
-  #\r
-  INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-  INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
-  INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
-  INF OvmfPkg/Virtio10Dxe/Virtio10.inf\r
-\r
-  #\r
-  # Video support\r
-  #\r
-  INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
-  INF OvmfPkg/PlatformDxe/Platform.inf\r
-\r
-  #\r
-  # USB Support\r
-  #\r
-  INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
-  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
-  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-\r
-  #\r
-  # TianoCore logo (splash screen)\r
-  #\r
-  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-  }\r
+!include ArmVirtQemuFvMain.fdf.inc\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
new file mode 100644 (file)
index 0000000..7bed678
--- /dev/null
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -0,0 +1,178 @@
+#\r
+#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.\r
+#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.\r
+#\r
+#  This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#\r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+\r
+################################################################################\r
+#\r
+# FV Section\r
+#\r
+# [FV] section is used to define what components or modules are placed within a flash\r
+# device file.  This section also defines order the components and modules are positioned\r
+# within the image.  The [FV] section consists of define statements, set statements and\r
+# module statements.\r
+#\r
+################################################################################\r
+\r
+[FV.FvMain]\r
+BlockSize          = 0x40\r
+NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
+FvAlignment        = 16        # FV alignment and FV attributes setting.\r
+ERASE_POLARITY     = 1\r
+MEMORY_MAPPED      = TRUE\r
+STICKY_WRITE       = TRUE\r
+LOCK_CAP           = TRUE\r
+LOCK_STATUS        = TRUE\r
+WRITE_DISABLED_CAP = TRUE\r
+WRITE_ENABLED_CAP  = TRUE\r
+WRITE_STATUS       = TRUE\r
+WRITE_LOCK_CAP     = TRUE\r
+WRITE_LOCK_STATUS  = TRUE\r
+READ_DISABLED_CAP  = TRUE\r
+READ_ENABLED_CAP   = TRUE\r
+READ_STATUS        = TRUE\r
+READ_LOCK_CAP      = TRUE\r
+READ_LOCK_STATUS   = TRUE\r
+\r
+  INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
+  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
+  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
+\r
+  #\r
+  # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
+  #\r
+  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
+  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
+  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
+  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+!endif\r
+  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
+  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
+  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
+  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
+\r
+  #\r
+  # Multiple Console IO support\r
+  #\r
+  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
+  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
+  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
+\r
+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
+  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
+  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
+\r
+  #\r
+  # FAT filesystem + GPT/MBR partitioning\r
+  #\r
+  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
+  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
+  INF FatPkg/EnhancedFatDxe/Fat.inf\r
+  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+\r
+  #\r
+  # Platform Driver\r
+  #\r
+  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+  INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
+  INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
+  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
+\r
+  #\r
+  # UEFI application (Shell Embedded Boot Loader)\r
+  #\r
+  INF ShellPkg/Application/Shell/Shell.inf\r
+\r
+  #\r
+  # Bds\r
+  #\r
+  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
+  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+  INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
+  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+  INF MdeModulePkg/Application/UiApp/UiApp.inf\r
+\r
+  #\r
+  # Networking stack\r
+  #\r
+  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
+  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
+  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
+  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
+  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
+  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
+  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
+  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
+  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+\r
+  #\r
+  # SCSI Bus and Disk Driver\r
+  #\r
+  INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
+  INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
+\r
+  #\r
+  # SMBIOS Support\r
+  #\r
+  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
+  INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
+\r
+!if $(ARCH) == AARCH64\r
+  #\r
+  # ACPI Support\r
+  #\r
+  INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+  INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+!endif\r
+\r
+  #\r
+  # PCI support\r
+  #\r
+  INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+  INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+  INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
+  INF OvmfPkg/Virtio10Dxe/Virtio10.inf\r
+\r
+  #\r
+  # Video support\r
+  #\r
+  INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+  INF OvmfPkg/PlatformDxe/Platform.inf\r
+\r
+  #\r
+  # USB Support\r
+  #\r
+  INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
+  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
+  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
+  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+\r
+  #\r
+  # TianoCore logo (splash screen)\r
+  #\r
+  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
+    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
+  }\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index dcea9771a28839d1a07a94313da25d8e451fced4..ee9fa189f85a57a2c61eea15ad07a2ab415f3586 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -104,159 +104,7 @@ FV = FVMAIN_COMPACT
 #\r
 ################################################################################\r
 \r
-[FV.FvMain]\r
-BlockSize          = 0x40\r
-NumBlocks          = 0         # This FV gets compressed so make it just big enough\r
-FvAlignment        = 16        # FV alignment and FV attributes setting.\r
-ERASE_POLARITY     = 1\r
-MEMORY_MAPPED      = TRUE\r
-STICKY_WRITE       = TRUE\r
-LOCK_CAP           = TRUE\r
-LOCK_STATUS        = TRUE\r
-WRITE_DISABLED_CAP = TRUE\r
-WRITE_ENABLED_CAP  = TRUE\r
-WRITE_STATUS       = TRUE\r
-WRITE_LOCK_CAP     = TRUE\r
-WRITE_LOCK_STATUS  = TRUE\r
-READ_DISABLED_CAP  = TRUE\r
-READ_ENABLED_CAP   = TRUE\r
-READ_STATUS        = TRUE\r
-READ_LOCK_CAP      = TRUE\r
-READ_LOCK_STATUS   = TRUE\r
-\r
-  INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
-  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
-  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
-\r
-  #\r
-  # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
-  #\r
-  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
-  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
-  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
-  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
-  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
-  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
-!endif\r
-  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
-  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
-  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
-\r
-  #\r
-  # Multiple Console IO support\r
-  #\r
-  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
-  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
-  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
-  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
-\r
-  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
-  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
-  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
-\r
-  #\r
-  # FAT filesystem + GPT/MBR partitioning\r
-  #\r
-  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
-  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  INF FatPkg/EnhancedFatDxe/Fat.inf\r
-  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
-\r
-  #\r
-  # Platform Driver\r
-  #\r
-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
-  INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
-  INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
-  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
-\r
-  #\r
-  # UEFI application (Shell Embedded Boot Loader)\r
-  #\r
-  INF ShellPkg/Application/Shell/Shell.inf\r
-\r
-  #\r
-  # Bds\r
-  #\r
-  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
-  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
-  INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-  INF MdeModulePkg/Application/UiApp/UiApp.inf\r
-\r
-  #\r
-  # Networking stack\r
-  #\r
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-\r
-  #\r
-  # SCSI Bus and Disk Driver\r
-  #\r
-  INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
-  INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
-\r
-  #\r
-  # SMBIOS Support\r
-  #\r
-  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
-  INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
-\r
-!if $(ARCH) == AARCH64\r
-  #\r
-  # ACPI Support\r
-  #\r
-  INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-  INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
-!endif\r
-\r
-  #\r
-  # PCI support\r
-  #\r
-  INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-  INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
-  INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
-  INF OvmfPkg/Virtio10Dxe/Virtio10.inf\r
-\r
-  #\r
-  # Video support\r
-  #\r
-  INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
-  INF OvmfPkg/PlatformDxe/Platform.inf\r
-\r
-  #\r
-  # USB Support\r
-  #\r
-  INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
-  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
-  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
-\r
-  #\r
-  # TianoCore logo (splash screen)\r
-  #\r
-  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-  }\r
+!include ArmVirtQemuFvMain.fdf.inc\r
 \r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r