ArmVirtPkg/PciHostBridgeDxe: move to FDT client protocol

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.dsc

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index a148615321ca7424fe772ee88a51744c060ba572..f2eccf8cca63aaf99858638a4208d197c9805479 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -66,6 +66,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
@@ -219,13 +220,10 @@
   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
@@ -315,7 +313,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