Commit 3eb2d672 authored by Sandrine Bailleux's avatar Sandrine Bailleux
Browse files

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: default avatarAchin Gupta <achin.gupta@arm.com>
Signed-off-by: default avatarSandrine Bailleux <sandrine.bailleux@arm.com>
parent d818a02c
...@@ -168,10 +168,12 @@ ...@@ -168,10 +168,12 @@
ARM_NS_DRAM1_SIZE, \ ARM_NS_DRAM1_SIZE, \
MT_MEMORY | MT_RW | MT_NS) MT_MEMORY | MT_RW | MT_NS)
#ifdef SPD_tspd
#define ARM_MAP_TSP_SEC_MEM MAP_REGION_FLAT( \ #define ARM_MAP_TSP_SEC_MEM MAP_REGION_FLAT( \
TSP_SEC_MEM_BASE, \ TSP_SEC_MEM_BASE, \
TSP_SEC_MEM_SIZE, \ TSP_SEC_MEM_SIZE, \
MT_MEMORY | MT_RW | MT_SECURE) MT_MEMORY | MT_RW | MT_SECURE)
#endif
#if ARM_BL31_IN_DRAM #if ARM_BL31_IN_DRAM
#define ARM_MAP_BL31_SEC_DRAM MAP_REGION_FLAT( \ #define ARM_MAP_BL31_SEC_DRAM MAP_REGION_FLAT( \
......
...@@ -33,7 +33,9 @@ const mmap_region_t plat_arm_mmap[] = { ...@@ -33,7 +33,9 @@ const mmap_region_t plat_arm_mmap[] = {
CSS_MAP_DEVICE, CSS_MAP_DEVICE,
SOC_CSS_MAP_DEVICE, SOC_CSS_MAP_DEVICE,
ARM_MAP_NS_DRAM1, ARM_MAP_NS_DRAM1,
#ifdef SPD_tspd
ARM_MAP_TSP_SEC_MEM, ARM_MAP_TSP_SEC_MEM,
#endif
#ifdef SPD_opteed #ifdef SPD_opteed
ARM_OPTEE_PAGEABLE_LOAD_MEM, ARM_OPTEE_PAGEABLE_LOAD_MEM,
#endif #endif
......
...@@ -79,7 +79,9 @@ const mmap_region_t plat_arm_mmap[] = { ...@@ -79,7 +79,9 @@ const mmap_region_t plat_arm_mmap[] = {
MAP_DEVICE0, MAP_DEVICE0,
MAP_DEVICE1, MAP_DEVICE1,
ARM_MAP_NS_DRAM1, ARM_MAP_NS_DRAM1,
#ifdef SPD_tspd
ARM_MAP_TSP_SEC_MEM, ARM_MAP_TSP_SEC_MEM,
#endif
#if TRUSTED_BOARD_BOOT #if TRUSTED_BOARD_BOOT
/* To access the Root of Trust Public Key registers. */ /* To access the Root of Trust Public Key registers. */
MAP_DEVICE2, MAP_DEVICE2,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment