ArmVirtPkg/ArmVirtPlatformLib: remove support for uncached mappings

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

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 2571884b20ac5eea97fdba3721eae4ca0da547da..744006d13cbba191c3bff5f889a13838170c23cc 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
@@ -83,12 +83,13 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
   #\r
-  # FAT filesystem + GPT/MBR partitioning\r
+  # FAT filesystem + GPT/MBR partitioning + UDF filesystem\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
+  INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
   #\r
   # Platform Driver\r
@@ -127,6 +128,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
   INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
   INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+!if $(HTTP_BOOT_ENABLE) == TRUE\r
+  INF NetworkPkg/DnsDxe/DnsDxe.inf\r
+  INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
+  INF NetworkPkg/HttpDxe/HttpDxe.inf\r
+  INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
+!endif\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r
@@ -140,11 +147,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
@@ -165,7 +174,6 @@ 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
@@ -177,13 +185,12 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
 \r
   #\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