SignedCapsulePkg: Replace [Ascii|Unicode]ValueToString

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index e26ca035f55572efb1cf6f6c7dfe6ed6334ab3b4..1a490d23f7b51823b2303a8c78e80f997aed0f34 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -3,6 +3,7 @@
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
 # Copyright (c) 2011 - 2015, ARM Ltd. All rights reserved.<BR>\r
+# Copyright (c) 2016, Linaro Ltd. 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
@@ -36,6 +37,7 @@
   RVCT:*_*_ARM_PLATFORM_FLAGS  == --cpu Cortex-A15\r
 \r
   RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
+  *_*_*_CC_FLAGS  = -DDISABLE_NEW_DEPRECATED_INTERFACES\r
 \r
 [LibraryClasses.common]\r
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
@@ -86,14 +88,9 @@
 \r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
-[LibraryClasses.ARM]\r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
-\r
-[LibraryClasses.AARCH64]\r
-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf\r
-\r
 [LibraryClasses.common.PEIM]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
@@ -111,12 +108,10 @@
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf\r
   ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
-  ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
   ArmPkg/Library/BdsLib/BdsLib.inf\r
   ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
   ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf\r
   ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf\r
-  ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf\r
   ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf\r
   ArmPkg/Library/RvdPeCoffExtraActionLib/RvdPeCoffExtraActionLib.inf\r
   ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf\r
@@ -144,21 +139,24 @@
 \r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
-\r
   ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
+  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf\r
+  ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
+  ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf\r
+  ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf\r
+  ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
+  ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf\r
+  ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf\r
+  ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
+  ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
+\r
 [Components.ARM]\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf\r
 \r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf\r
-\r
 [Components.AARCH64]\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf\r
-\r
-  ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf\r
-  ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf\r
+  ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf\r