Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-21 03:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(plat/arm): allow BL32 specific defines to be used by SPMC_AT_EL3

Browse source 
For EL3 SPMC configuration enabled platforms, allow the reuse of
BL32 specific definitions.

Signed-off-by: Marc Bonnici <marc.bonnici@arm.com>
Change-Id: I37ffbbf680326c101fbb2f146085a96c138f07a1
This commit is contained in:
Marc Bonnici 2021-12-20 10:53:52 +00:00
parent 44639ab73e
commit 2d65ea1930
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/plat/arm/common/arm_def.h
View file

@ -618,7 +618,7 @@
* Trusted DRAM (if available) or the DRAM region secured by the TrustZone * Trusted DRAM (if available) or the DRAM region secured by the TrustZone
* controller. * controller.
*/ */
# if SPM_MM # if SPM_MM || SPMC_AT_EL3
# define TSP_SEC_MEM_BASE (ARM_AP_TZC_DRAM1_BASE + ULL(0x200000)) # define TSP_SEC_MEM_BASE (ARM_AP_TZC_DRAM1_BASE + ULL(0x200000))
# define TSP_SEC_MEM_SIZE (ARM_AP_TZC_DRAM1_SIZE - ULL(0x200000)) # define TSP_SEC_MEM_SIZE (ARM_AP_TZC_DRAM1_SIZE - ULL(0x200000))
# define BL32_BASE (ARM_AP_TZC_DRAM1_BASE + ULL(0x200000)) # define BL32_BASE (ARM_AP_TZC_DRAM1_BASE + ULL(0x200000))
@ -664,12 +664,13 @@
/* /*
* BL32 is mandatory in AArch32. In AArch64, undefine BL32_BASE if there is no * BL32 is mandatory in AArch32. In AArch64, undefine BL32_BASE if there is no
* SPD and no SPM-MM, as they are the only ones that can be used as BL32. * SPD and no SPM-MM and no SPMC-AT-EL3, as they are the only ones that can be
* used as BL32.
*/ */
#if defined(__aarch64__) && !JUNO_AARCH32_EL3_RUNTIME #if defined(__aarch64__) && !JUNO_AARCH32_EL3_RUNTIME
# if defined(SPD_none) && !SPM_MM # if defined(SPD_none) && !SPM_MM && !SPMC_AT_EL3
# undef BL32_BASE # undef BL32_BASE
# endif /* defined(SPD_none) && !SPM_MM */ # endif /* defined(SPD_none) && !SPM_MM || !SPMC_AT_EL3 */
#endif /* defined(__aarch64__) && !JUNO_AARCH32_EL3_RUNTIME */ #endif /* defined(__aarch64__) && !JUNO_AARCH32_EL3_RUNTIME */
/******************************************************************************* /*******************************************************************************