From 07146afb1164e42adf068a505f1d3105c4acaff5 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Fri, 14 Dec 2018 01:27:19 +0000 Subject: [PATCH] plat/arm: Always define TSP memory region Even though this is not used unless SPD=tspd, only defining it when SPD_tspd is defined doesn't have any advantage and it makes it harder to read the code. Change-Id: I3d93135e05f39be071d16f8a47394a9a3ff54bc8 Signed-off-by: Antonio Nino Diaz --- include/plat/arm/common/arm_def.h | 2 -- plat/arm/css/sgm/sgm_mmap_config.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index c5c10ab17..4ab3a8086 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -207,13 +207,11 @@ ARM_DRAM2_BASE, \ ARM_DRAM2_SIZE, \ MT_MEMORY | MT_RW | MT_NS) -#ifdef SPD_tspd #define ARM_MAP_TSP_SEC_MEM MAP_REGION_FLAT( \ TSP_SEC_MEM_BASE, \ TSP_SEC_MEM_SIZE, \ MT_MEMORY | MT_RW | MT_SECURE) -#endif #if ARM_BL31_IN_DRAM #define ARM_MAP_BL31_SEC_DRAM MAP_REGION_FLAT( \ diff --git a/plat/arm/css/sgm/sgm_mmap_config.c b/plat/arm/css/sgm/sgm_mmap_config.c index 0f0410995..6800ac3cf 100644 --- a/plat/arm/css/sgm/sgm_mmap_config.c +++ b/plat/arm/css/sgm/sgm_mmap_config.c @@ -39,7 +39,9 @@ const mmap_region_t plat_arm_mmap[] = { CSS_MAP_GIC_DEVICE, SOC_CSS_MAP_DEVICE, ARM_MAP_NS_DRAM1, +#ifdef SPD_tspd ARM_MAP_TSP_SEC_MEM, +#endif #ifdef SPD_opteed ARM_OPTEE_PAGEABLE_LOAD_MEM, #endif