ArmVirtPkg: move TimerDxe to FDT client library

[mirror_edk2.git] / ArmVirtPkg / ArmVirtXen.dsc

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 32e0afc0cedc56dd3b17943179871a4263c24b91..2d52f4b03b87b7c6258171e229977dfde9430abd 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -1,7 +1,7 @@
 #\r
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.\r
-#  Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -24,7 +24,7 @@
   PLATFORM_VERSION               = 0.1\r
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/ArmVirtXen-$(ARCH)\r
-  SUPPORTED_ARCHITECTURES        = AARCH64\r
+  SUPPORTED_ARCHITECTURES        = AARCH64|ARM\r
   BUILD_TARGETS                  = DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
   FLASH_DEFINITION               = ArmVirtPkg/ArmVirtXen.fdf\r
@@ -65,10 +65,10 @@
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 \r
 [LibraryClasses.AARCH64.SEC]\r
-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf\r
+  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf\r
 \r
 [LibraryClasses.ARM.SEC]\r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf\r
 \r
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include\r
@@ -129,7 +129,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
@@ -147,8 +146,6 @@
   gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
   gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
 \r
-  gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0\r
-\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
 ################################################################################\r
@@ -167,9 +164,7 @@
       PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
       HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf\r
       PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
-      ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf\r
       MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf\r
-      ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
       SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf\r
   }\r
 \r
@@ -180,7 +175,10 @@
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf\r
   }\r
-  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf {\r
+    <LibraryClasses>\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
+  }\r
 \r
   #\r
   # Architectural Protocols\r
@@ -204,13 +202,17 @@
   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
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
   #\r
   # Platform Driver\r
   #\r
   ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
+  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
 \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
@@ -218,6 +220,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