From 3eb2d672fcd2d86ba56359760d2eb0df758a6843 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Wed, 30 Aug 2017 10:59:22 +0100 Subject: [PATCH] ARM platforms: Map TSP only when TSPD is included This patch ensures that the ARM_MAP_TSP_SEC_MEM memory region is mapped in BL2 only if the TSPD has been included in the build. This saves one entry in the plat_arm_mmap[] array and avoids to map extra memory when it's not needed. Change-Id: I6ae60822ff8f0de198145925b0b0d45355179a94 Signed-off-by: Achin Gupta Signed-off-by: Sandrine Bailleux --- include/plat/arm/common/arm_def.h | 2 ++ plat/arm/board/common/board_css_common.c | 2 ++ plat/arm/board/fvp/fvp_common.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 106cd747f..d44e27837 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -168,10 +168,12 @@ ARM_NS_DRAM1_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/board/common/board_css_common.c b/plat/arm/board/common/board_css_common.c index 139a3af84..2495e28fe 100644 --- a/plat/arm/board/common/board_css_common.c +++ b/plat/arm/board/common/board_css_common.c @@ -33,7 +33,9 @@ const mmap_region_t plat_arm_mmap[] = { CSS_MAP_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 diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c index d97a04920..e23274573 100644 --- a/plat/arm/board/fvp/fvp_common.c +++ b/plat/arm/board/fvp/fvp_common.c @@ -79,7 +79,9 @@ const mmap_region_t plat_arm_mmap[] = { MAP_DEVICE0, MAP_DEVICE1, ARM_MAP_NS_DRAM1, +#ifdef SPD_tspd ARM_MAP_TSP_SEC_MEM, +#endif #if TRUSTED_BOARD_BOOT /* To access the Root of Trust Public Key registers. */ MAP_DEVICE2, -- GitLab