OvmfPkg: Use MdeModulePkg/BDS

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index b8c4de90298d09d2aff4505d91a132a2a0408522..9d045431adfe19c316fdb56f22ee3b06de805316 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -207,11 +207,7 @@ INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-!if $(USE_OLD_PCI_HOST) == TRUE\r
-INF  OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-!else\r
 INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-!endif\r
 INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf\r
@@ -238,7 +234,12 @@ 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
+!if $(USE_OLD_BDS) == TRUE\r
 INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!else\r
+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  MdeModulePkg/Application/UiApp/UiApp.inf\r
+!endif\r
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
@@ -275,7 +276,7 @@ INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
 INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
 \r
-INF  RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
 !ifndef $(USE_OLD_SHELL)\r
 INF  ShellPkg/Application/Shell/Shell.inf\r