Always define ARM_TSP_RAM_LOCATION_ID
authorRoberto Vargas <roberto.vargas@arm.com>
Fri, 20 Oct 2017 09:46:23 +0000 (10:46 +0100)
committerRoberto Vargas <roberto.vargas@arm.com>
Wed, 1 Nov 2017 08:26:24 +0000 (08:26 +0000)
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>
plat/arm/common/arm_common.mk

index 82f02b1764beebb46997bd2e818cc8d7795e7e8d..2239a08b39a7735efe6df14365c01f98c237b33c 100644 (file)
@@ -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.