BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index cf9a5c12108b03f0dd2328f09f46e3d9c355a379..810caaff629f445afd926e1b549045aa26e0b704 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -2,7 +2,7 @@
 # ARM processor package.\r
 #\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) 2011 - 2018, 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
@@ -27,14 +27,12 @@
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/Arm\r
   SUPPORTED_ARCHITECTURES        = ARM|AARCH64\r
-  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT\r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 [BuildOptions]\r
   XCODE:*_*_ARM_PLATFORM_FLAGS  == -arch armv7\r
   GCC:*_*_ARM_PLATFORM_FLAGS    == -march=armv7-a -mfpu=neon\r
-  # We use A15 to get the Secure and Virtualization extensions\r
-  RVCT:*_*_ARM_PLATFORM_FLAGS  == --cpu Cortex-A15\r
 \r
   RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
   *_*_*_CC_FLAGS  = -DDISABLE_NEW_DEPRECATED_INTERFACES\r
@@ -73,12 +71,12 @@
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf\r
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
+  OpteeLib|ArmPkg/Library/OpteeLib/OpteeLib.inf\r
 \r
   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
 \r
-  BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf\r
 \r
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
@@ -90,6 +88,8 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
+  ArmMtlLib|ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.inf\r
+\r
 [LibraryClasses.common.PEIM]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf\r
@@ -106,7 +106,6 @@
 [Components.common]\r
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf\r
   ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.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
@@ -123,7 +122,6 @@
   ArmPkg/Drivers/CpuPei/CpuPei.inf\r
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   ArmPkg/Drivers/ArmGic/ArmGicLib.inf\r
-  ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf\r
   ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.inf\r
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
 \r
@@ -134,6 +132,7 @@
   ArmPkg/Library/ArmSmcLibNull/ArmSmcLibNull.inf\r
   ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf\r
   ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf\r
+  ArmPkg/Library/OpteeLib/OpteeLib.inf\r
 \r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r
@@ -149,5 +148,7 @@
   ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
   ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
 \r
+  ArmPkg/Drivers/ArmScmiDxe/ArmScmiDxe.inf\r
+\r
 [Components.AARCH64]\r
   ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf\r