ArmPlatformPkg: Fixed deprecated ifdef syntax in DSC files

The syntax '!ifdef $(MACRO)' is deprecated and should be replaced by '!ifdef MACRO'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14440 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 0b262d3990688650b84e06bd770d41cb8a312fb7..c4a1df5a0d39bd8a9bcb4206e4a64a94fb6f280c 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -54,7 +54,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -148,7 +148,7 @@
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   ArmPlatformPkg/PrePi/PeiUniCore.inf {\r
     <LibraryClasses>\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index ff62ee596a977c23b00ac5aec93fd5807c61fd9e..2686df4eefbc39180cd49498712589b07f16979e 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -54,7 +54,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -151,7 +151,7 @@
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
     <LibraryClasses>\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
index 17aba332e2330fcf825f9fbf91ce8e4141b4fed0..956e92074b8e89eed60addcc8bbf6c141b54fb7d 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -48,7 +48,7 @@
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
 \r
 [BuildOptions]\r
-!ifdef $(ARM_BIGLITTLE_TC2)\r
+!ifdef ARM_BIGLITTLE_TC2\r
   RVCT:*_*_ARM_ARCHCC_FLAGS  = -DARM_BIGLITTLE_TC2=1\r
   RVCT:*_*_ARM_PP_FLAGS  = -DARM_BIGLITTLE_TC2=1\r
 \r
@@ -97,7 +97,7 @@
   # Stacks for MPCores in Secure World\r
   # SRAM (CS1) is only available between 0x14000000 and 0x14001000 on the model\r
   # ZBT SRAM is available between 0x2E000000 and 0x2E010000 on the model\r
-!ifdef $(ARM_BIGLITTLE_TC2)\r
+!ifdef ARM_BIGLITTLE_TC2\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x17000000\r
 !else\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x2E000000\r
@@ -111,7 +111,7 @@
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000\r
   gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000\r
 \r
-!ifdef $(ARM_BIGLITTLE_TC2)\r
+!ifdef ARM_BIGLITTLE_TC2\r
   # TC2 Dual-Cluster profile\r
   gArmPlatformTokenSpaceGuid.PcdClusterCount|2\r
 \r
@@ -149,7 +149,7 @@
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000\r
 \r
-!ifdef $(ARM_BIGLITTLE_TC2)\r
+!ifdef ARM_BIGLITTLE_TC2\r
   ## PL111 Lcd & HdLcd\r
   gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000\r
   gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x2B000000\r
@@ -190,7 +190,7 @@
   #\r
   # ARM Architectural Timer Frequency\r
   #\r
-!ifdef $(ARM_BIGLITTLE_TC2)\r
+!ifdef ARM_BIGLITTLE_TC2\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|24000000\r
 !else\r
   gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|10000000\r
@@ -253,7 +253,7 @@
   #\r
   # Filesystems\r
   #\r
-!ifndef $(ARM_BIGLITTLE_TC2)\r
+!ifndef ARM_BIGLITTLE_TC2\r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 !endif\r
   \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 2b4484ab8639b2ef343320b8cdce1f9546dc9a4d..42a5119e74a2305f4c2fcaf1f0df184e06ddcb11 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -81,7 +81,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef $(EDK2_ARMVE_STANDALONE)\r
+!ifdef EDK2_ARMVE_STANDALONE\r
   gArmPlatformTokenSpaceGuid.PcdStandalone|TRUE\r
 !else\r
   gArmPlatformTokenSpaceGuid.PcdStandalone|FALSE\r
@@ -89,7 +89,7 @@
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
 \r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -210,7 +210,7 @@
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
     <LibraryClasses>\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index 548eee56104473d932edf3246c8052ba4dd8153d..2d12f4ba85e5e3d1b8d997c59d8db30636137afb 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -61,7 +61,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -177,7 +177,7 @@
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   ArmPlatformPkg/PrePi/PeiUniCore.inf {\r
     <LibraryClasses>\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index 0001f8a05da2cb198a27955fbe272af797b02803..efd80ab0a77c91767e0e8ef22ff1f4dfb60474f1 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -61,7 +61,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -179,7 +179,7 @@
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
     <LibraryClasses>\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index 43151797ada22ebe43c22b1813cfa5d0cca51262..b6355026a3d46604acaef84feaf7239fa990991f 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -63,7 +63,7 @@
 \r
 [PcdsFeatureFlag.common]\r
 \r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -188,7 +188,7 @@
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
     <LibraryClasses>\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r