ArmVirtPkg: remove QemuVideoDxe from ArmVirtQemu and ArmVirtQemuKernel

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuFvMain.fdf.inc

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index eac12d18a8676d5debcf9723fdbb862dbbf72c21..3194aa3edc8e0713071eff391a9acebad77db5b7 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -63,7 +63,7 @@ READ_LOCK_STATUS   = TRUE
   INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
 !endif\r
   INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
-  INF EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
+  INF MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
   INF EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
   INF EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf\r
   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
@@ -140,11 +140,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 ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+!if $(ARCH) == AARCH64\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+  INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
   INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
 \r
   #\r
@@ -156,7 +158,8 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # PCI support\r
   #\r
-  INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+  INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf\r
+  INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
   INF OvmfPkg/Virtio10Dxe/Virtio10.inf\r
@@ -164,7 +167,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # Video support\r
   #\r
-  INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+  INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
   INF OvmfPkg/PlatformDxe/Platform.inf\r
 \r
   #\r
@@ -179,9 +182,7 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # TianoCore logo (splash screen)\r
   #\r
-  FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-  }\r
+  INF MdeModulePkg/Logo/LogoDxe.inf\r
 \r
   #\r
   # Ramdisk support\r