summaryrefslogtreecommitdiff
path: root/ArmPlatformPkg/ArmVExpressPkg
diff options
context:
space:
mode:
authorOlivier Martin <olivier.martin@arm.com>2013-06-21 11:08:17 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2013-06-21 11:08:17 +0000
commite7c578c9028b570ddcc20997723b1e8922e46062 (patch)
tree80ebdd9b76c66102772c362e034d4ad594b5cf5e /ArmPlatformPkg/ArmVExpressPkg
parentcae32cfeb200fd4bba210983a0c5c36fafdfecaf (diff)
downloadedk2-platforms-e7c578c9028b570ddcc20997723b1e8922e46062.tar.xz
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
Diffstat (limited to 'ArmPlatformPkg/ArmVExpressPkg')
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc12
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc6
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc4
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc4
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc4
5 files changed, 15 insertions, 15 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
index 17aba332e2..956e92074b 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -48,7 +48,7 @@
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
[BuildOptions]
-!ifdef $(ARM_BIGLITTLE_TC2)
+!ifdef ARM_BIGLITTLE_TC2
RVCT:*_*_ARM_ARCHCC_FLAGS = -DARM_BIGLITTLE_TC2=1
RVCT:*_*_ARM_PP_FLAGS = -DARM_BIGLITTLE_TC2=1
@@ -97,7 +97,7 @@
# Stacks for MPCores in Secure World
# SRAM (CS1) is only available between 0x14000000 and 0x14001000 on the model
# ZBT SRAM is available between 0x2E000000 and 0x2E010000 on the model
-!ifdef $(ARM_BIGLITTLE_TC2)
+!ifdef ARM_BIGLITTLE_TC2
gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x17000000
!else
gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x2E000000
@@ -111,7 +111,7 @@
gArmTokenSpaceGuid.PcdSystemMemoryBase|0x80000000
gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000
-!ifdef $(ARM_BIGLITTLE_TC2)
+!ifdef ARM_BIGLITTLE_TC2
# TC2 Dual-Cluster profile
gArmPlatformTokenSpaceGuid.PcdClusterCount|2
@@ -149,7 +149,7 @@
## PL031 RealTimeClock
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000
-!ifdef $(ARM_BIGLITTLE_TC2)
+!ifdef ARM_BIGLITTLE_TC2
## PL111 Lcd & HdLcd
gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1C1F0000
gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x2B000000
@@ -190,7 +190,7 @@
#
# ARM Architectural Timer Frequency
#
-!ifdef $(ARM_BIGLITTLE_TC2)
+!ifdef ARM_BIGLITTLE_TC2
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|24000000
!else
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|10000000
@@ -253,7 +253,7 @@
#
# Filesystems
#
-!ifndef $(ARM_BIGLITTLE_TC2)
+!ifndef ARM_BIGLITTLE_TC2
ArmPkg/Filesystem/SemihostFs/SemihostFs.inf
!endif
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 2b4484ab86..42a5119e74 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -81,7 +81,7 @@
################################################################################
[PcdsFeatureFlag.common]
-!ifdef $(EDK2_ARMVE_STANDALONE)
+!ifdef EDK2_ARMVE_STANDALONE
gArmPlatformTokenSpaceGuid.PcdStandalone|TRUE
!else
gArmPlatformTokenSpaceGuid.PcdStandalone|FALSE
@@ -89,7 +89,7 @@
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE
!endif
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE
!endif
@@ -210,7 +210,7 @@
#
# PEI Phase modules
#
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
ArmPlatformPkg/PrePi/PeiMPCore.inf {
<LibraryClasses>
ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index 548eee5610..2d12f4ba85 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -61,7 +61,7 @@
################################################################################
[PcdsFeatureFlag.common]
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE
!endif
@@ -177,7 +177,7 @@
#
# PEI Phase modules
#
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
ArmPlatformPkg/PrePi/PeiUniCore.inf {
<LibraryClasses>
ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index 0001f8a05d..efd80ab0a7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -61,7 +61,7 @@
################################################################################
[PcdsFeatureFlag.common]
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE
!endif
@@ -179,7 +179,7 @@
#
# PEI Phase modules
#
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
ArmPlatformPkg/PrePi/PeiMPCore.inf {
<LibraryClasses>
ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf
diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index 43151797ad..b6355026a3 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -63,7 +63,7 @@
[PcdsFeatureFlag.common]
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE
gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE
!endif
@@ -188,7 +188,7 @@
#
# PEI Phase modules
#
-!ifdef $(EDK2_SKIP_PEICORE)
+!ifdef EDK2_SKIP_PEICORE
ArmPlatformPkg/PrePi/PeiMPCore.inf {
<LibraryClasses>
ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf