diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2017-08-30 10:59:22 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2017-08-31 16:18:00 +0100 |
| commit | 3eb2d672fcd2d86ba56359760d2eb0df758a6843 (patch) | |
| tree | 8bd145f9e88f58443d5edae272c2005af938cf0d | |
| parent | d818a02cb489eae1f99cabf949d47e56347e4537 (diff) | |
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 <achin.gupta@arm.com>
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 2 | ||||
| -rw-r--r-- | plat/arm/board/common/board_css_common.c | 2 | ||||
| -rw-r--r-- | plat/arm/board/fvp/fvp_common.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 106cd747..d44e2783 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 139a3af8..2495e28f 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 d97a0492..e2327457 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, |