aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Vargas <roberto.vargas@arm.com>2017-10-20 10:46:23 +0100
committerRoberto Vargas <roberto.vargas@arm.com>2017-11-01 08:26:24 +0000
commitd58f3cacc3520e17430997af6dadb2beeae7e503 (patch)
treeedd4ce63173f8c97ced255f50cc87de76f8903e2
parent4d476e45f271dd520fb22a5a7277c59689400a4d (diff)
downloadarm-trusted-firmware-d58f3cacc3520e17430997af6dadb2beeae7e503.tar.gz
Always define ARM_TSP_RAM_LOCATION_ID
ARM_TSP_RAM_LOCATION_ID was defined only in AARCH64, but the macro was also used in AARCH32, and it meant that it was taking the value 0, which happened to equal ARM_TRUSTED_SRAM_ID. Change-Id: If9f4dbee1a2ba15e7806f2a03305b554bd327363 Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
-rw-r--r--plat/arm/common/arm_common.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 82f02b17..2239a08b 100644
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -21,14 +21,17 @@ ifeq (${ARCH}, aarch64)
endif
# Process flags
- $(eval $(call add_define,ARM_TSP_RAM_LOCATION_ID))
-
# Process ARM_BL31_IN_DRAM flag
ARM_BL31_IN_DRAM := 0
$(eval $(call assert_boolean,ARM_BL31_IN_DRAM))
$(eval $(call add_define,ARM_BL31_IN_DRAM))
+else
+ ARM_TSP_RAM_LOCATION_ID = ARM_TRUSTED_SRAM_ID
endif
+$(eval $(call add_define,ARM_TSP_RAM_LOCATION_ID))
+
+
# For the original power-state parameter format, the State-ID can be encoded
# according to the recommended encoding or zero. This flag determines which
# State-ID encoding to be parsed.