From d58f3cacc3520e17430997af6dadb2beeae7e503 Mon Sep 17 00:00:00 2001 From: Roberto Vargas Date: Fri, 20 Oct 2017 10:46:23 +0100 Subject: [PATCH] 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 --- plat/arm/common/arm_common.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index 82f02b176..2239a08b3 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.