ArmVirtPkg: move TimerDxe to FDT client library

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 499173e08f70b33684a9e16a176f95622f64af69..9bf1b632aa99fc2b6bf0940588c23e5485ce1f0b 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -193,7 +193,6 @@
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x0\r
   gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x0\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x0\r
-  gArmVirtTokenSpaceGuid.PcdArmGicRevision|0x0\r
 \r
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0\r
@@ -207,8 +206,6 @@
   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
@@ -294,7 +291,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
@@ -306,6 +306,7 @@
   # Platform Driver\r
   #\r
   ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
+  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
@@ -316,6 +317,7 @@
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
+  FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
   #\r
   # Bds\r