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>

1 files changed, 1 insertions, 153 deletions

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf
index dcea9771a2..ee9fa189f8 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -104,159 +104,7 @@ FV = FVMAIN_COMPACT
 #

 ################################################################################

 

-[FV.FvMain]

-BlockSize          = 0x40

-NumBlocks          = 0         # This FV gets compressed so make it just big enough

-FvAlignment        = 16        # FV alignment and FV attributes setting.

-ERASE_POLARITY     = 1

-MEMORY_MAPPED      = TRUE

-STICKY_WRITE       = TRUE

-LOCK_CAP           = TRUE

-LOCK_STATUS        = TRUE

-WRITE_DISABLED_CAP = TRUE

-WRITE_ENABLED_CAP  = TRUE

-WRITE_STATUS       = TRUE

-WRITE_LOCK_CAP     = TRUE

-WRITE_LOCK_STATUS  = TRUE

-READ_DISABLED_CAP  = TRUE

-READ_ENABLED_CAP   = TRUE

-READ_STATUS        = TRUE

-READ_LOCK_CAP      = TRUE

-READ_LOCK_STATUS   = TRUE

-

-  INF MdeModulePkg/Core/Dxe/DxeMain.inf

-  INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

-  INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf

-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf

-  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf

-

-  #

-  # PI DXE Drivers producing Architectural Protocols (EFI Services)

-  #

-  INF ArmPkg/Drivers/CpuDxe/CpuDxe.inf

-  INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf

-  INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

-  INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

-  INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

-  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

-!if $(SECURE_BOOT_ENABLE) == TRUE

-  INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf

-!endif

-  INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

-  INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

-  INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

-  INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

-

-  #

-  # Multiple Console IO support

-  #

-  INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

-  INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

-  INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

-  INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

-  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf

-

-  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

-  INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

-  INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

-  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

-

-  #

-  # FAT filesystem + GPT/MBR partitioning

-  #

-  INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

-  INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

-  INF FatPkg/EnhancedFatDxe/Fat.inf

-  INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

-

-  #

-  # Platform Driver

-  #

-  INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf

-  INF OvmfPkg/VirtioNetDxe/VirtioNet.inf

-  INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf

-  INF OvmfPkg/VirtioRngDxe/VirtioRng.inf

-

-  #

-  # UEFI application (Shell Embedded Boot Loader)

-  #

-  INF ShellPkg/Application/Shell/Shell.inf

-

-  #

-  # Bds

-  #

-  INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

-  INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

-  INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

-  INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf

-  INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf

-  INF MdeModulePkg/Application/UiApp/UiApp.inf

-

-  #

-  # Networking stack

-  #

-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

-  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

-  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

-  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

-

-  #

-  # SCSI Bus and Disk Driver

-  #

-  INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf

-  INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

-

-  #

-  # SMBIOS Support

-  #

-  INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

-  INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf

-

-!if $(ARCH) == AARCH64

-  #

-  # ACPI Support

-  #

-  INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

-  INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf

-!endif

-

-  #

-  # PCI support

-  #

-  INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf

-  INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf

-  INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf

-  INF OvmfPkg/Virtio10Dxe/Virtio10.inf

-

-  #

-  # Video support

-  #

-  INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf

-  INF OvmfPkg/PlatformDxe/Platform.inf

-

-  #

-  # USB Support

-  #

-  INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf

-  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf

-  INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf

-  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

-  INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

-

-  #

-  # TianoCore logo (splash screen)

-  #

-  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {

-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp

-  }

+!include ArmVirtQemuFvMain.fdf.inc

 

 [FV.FVMAIN_COMPACT]

 FvAlignment        = 16