ArmVirtPkg/VirtFdtDxe: drop PCI host bridge handling

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 3eb441284d2a47383945abba86067aa84085bf1e..2cbeced695f95cadd387e339df5e23e8a4b49d0d 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -65,6 +65,7 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf\r
 !endif\r
+  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
 \r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
@@ -193,25 +194,13 @@
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x0\r
   gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0\r
-  gArmVirtTokenSpaceGuid.PcdArmGicRevision|0x0\r
 \r
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdPciBusMin|0x0\r
-  gArmPlatformTokenSpaceGuid.PcdPciBusMax|0x0\r
-  gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x0\r
-  gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x0\r
-  gArmPlatformTokenSpaceGuid.PcdPciIoTranslation|0x0\r
-  gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x0\r
-  gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0\r
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0\r
-\r
-  gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0\r
-\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
+  # set PcdPciExpressBaseAddress to MAX_UINT64, which signifies that this\r
+  # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r
@@ -294,7 +283,10 @@
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 \r
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
-  ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
+  ArmPkg/Drivers/TimerDxe/TimerDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
+  }\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf\r
 !else\r
@@ -346,13 +338,19 @@
   # ACPI Support\r
   #\r
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+  }\r
 \r
   #\r
   # PCI support\r
   #\r
   ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+  }\r
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
   OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 \r