ArmVirtPkg: drop dependency on DxePcdLib for DXE Pcd.inf

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.fdf

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 89a4015e595b0308e51f6d41318d6d4ea8cfbd45..c973beb25cde4f2724bbfec3f51c61f74f4d154d 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -108,6 +108,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Dxe/DxeMain.inf\r
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
   INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
+  INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
 \r
   #\r
   # PI DXE Drivers producing Architectural Protocols (EFI Services)\r
@@ -134,7 +135,7 @@ READ_LOCK_STATUS   = TRUE
   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 EmbeddedPkg/SerialDxe/SerialDxe.inf\r
+  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
 \r
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
@@ -159,6 +160,7 @@ READ_LOCK_STATUS   = TRUE
   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
@@ -200,11 +202,13 @@ READ_LOCK_STATUS   = TRUE
   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
@@ -212,6 +216,7 @@ READ_LOCK_STATUS   = TRUE
   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
@@ -235,11 +240,6 @@ READ_LOCK_STATUS   = TRUE
     SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
   }\r
 \r
-!if $(ARCH) == ARM\r
-  INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  INF ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
-!endif\r
-\r
 [FV.FVMAIN_COMPACT]\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r