OvmfPkg: prevent 64-bit MMIO BAR degradation if there is no CSM

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index d8b119a8f29892bfd08a6a40881db257e54a810b..dd5ea30662d60ab8c812db19d783836075c0f93e 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -207,7 +207,8 @@ INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-INF  OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+INF  OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
+INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
 INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf\r
@@ -215,8 +216,10 @@ INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
 \r
 INF  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
 INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
+INF  OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
+INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
 INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
 INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
@@ -232,17 +235,20 @@ INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
 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  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
+INF  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
 INF  OvmfPkg/SataControllerDxe/SataControllerDxe.inf\r
 INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf\r
 INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
@@ -264,11 +270,10 @@ INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
-INF  OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
 \r
-INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
 !ifndef $(USE_OLD_SHELL)\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
@@ -441,6 +446,8 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+    RAW ACPI  Optional               |.acpi\r
+    RAW ASL   Optional               |.aml\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r