OvmfPkg: switch to MdeModulePkg/Bus/Pci/PciHostBridgeDxe

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.dsc

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 1c346a2ad03d957b9ddda81d4639ff2da522f554..8d6271824f8906f9acaa2fae5ee0f464b706daa9 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -37,6 +37,7 @@
   DEFINE NETWORK_IP6_ENABLE      = FALSE\r
   DEFINE HTTP_BOOT_ENABLE        = FALSE\r
   DEFINE SMM_REQUIRE             = FALSE\r
+  DEFINE USE_OLD_PCI_HOST        = FALSE\r
 \r
 [BuildOptions]\r
   GCC:*_UNIXGCC_*_CC_FLAGS             = -DMDEPKG_NDEBUG\r
@@ -87,6 +88,7 @@
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf\r
   PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf\r
   PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf\r
+  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r
   SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf\r
@@ -369,7 +371,29 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x07\r
+\r
+  # DEBUG_INIT      0x00000001  // Initialization\r
+  # DEBUG_WARN      0x00000002  // Warnings\r
+  # DEBUG_LOAD      0x00000004  // Load events\r
+  # DEBUG_FS        0x00000008  // EFI File system\r
+  # DEBUG_POOL      0x00000010  // Alloc & Free (pool)\r
+  # DEBUG_PAGE      0x00000020  // Alloc & Free (page)\r
+  # DEBUG_INFO      0x00000040  // Informational debug messages\r
+  # DEBUG_DISPATCH  0x00000080  // PEI/DXE/SMM Dispatchers\r
+  # DEBUG_VARIABLE  0x00000100  // Variable\r
+  # DEBUG_BM        0x00000400  // Boot Manager\r
+  # DEBUG_BLKIO     0x00001000  // BlkIo Driver\r
+  # DEBUG_NET       0x00004000  // SNP Driver\r
+  # DEBUG_UNDI      0x00010000  // UNDI Driver\r
+  # DEBUG_LOADFILE  0x00020000  // LoadFile\r
+  # DEBUG_EVENT     0x00080000  // Event messages\r
+  # DEBUG_GCD       0x00100000  // Global Coherency Database changes\r
+  # DEBUG_CACHE     0x00200000  // Memory range cachability changes\r
+  # DEBUG_VERBOSE   0x00400000  // Detailed debug messages that may\r
+  #                             // significantly impact boot performance\r
+  # DEBUG_ERROR     0x80000000  // Error\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F\r
+\r
 !ifdef $(SOURCE_DEBUG_ENABLE)\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
 !else\r
@@ -412,6 +436,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600\r
   gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Base|0x0\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Size|0x0\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0\r
 \r
@@ -507,7 +533,14 @@
   UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
   UefiCpuPkg/CpuDxe/CpuDxe.inf\r
   PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
+!if $(USE_OLD_PCI_HOST) == TRUE\r
   OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+!else\r
+  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\r
+    <LibraryClasses>\r
+      PciHostBridgeLib|OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf\r
+  }\r
+!endif\r
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r