aboutsummaryrefslogtreecommitdiff
path: root/plat/st/stm32mp1/plat_bl2_mem_params_desc.c
diff options
context:
space:
mode:
authorYann Gautier <yann.gautier@foss.st.com>2021-07-13 14:44:09 +0200
committerYann Gautier <yann.gautier@foss.st.com>2021-09-06 13:21:54 +0200
commit84090d2ca4aeace94911442ebe4cc7de3ab794e6 (patch)
tree79f213544a4373b90d04a6efee49c17ceea3bb15 /plat/st/stm32mp1/plat_bl2_mem_params_desc.c
parentb84a850864c05fef587fcbb301f955428966de64 (diff)
downloadtrusted-firmware-a-84090d2ca4aeace94911442ebe4cc7de3ab794e6.tar.gz
refactor(plat/st): updates for OP-TEE
Protect BL32 (SP_min) with MMU if OP-TEE is not used. Validate OP-TEE header with optee_header_is_valid(). Use default values in bl2_mem_params_descs[]. They will be overwritten in bl2_plat_handle_post_image_load() if OP-TEE is used. Change-Id: I8614f3a17caa827561614d0f25f30ee90c4ec3fe Signed-off-by: Etienne Carriere <etienne.carriere@st.com> Signed-off-by: Yann Gautier <yann.gautier@foss.st.com>
Diffstat (limited to 'plat/st/stm32mp1/plat_bl2_mem_params_desc.c')
-rw-r--r--plat/st/stm32mp1/plat_bl2_mem_params_desc.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/plat/st/stm32mp1/plat_bl2_mem_params_desc.c b/plat/st/stm32mp1/plat_bl2_mem_params_desc.c
index 984c6ba08b..293ddfd93a 100644
--- a/plat/st/stm32mp1/plat_bl2_mem_params_desc.c
+++ b/plat/st/stm32mp1/plat_bl2_mem_params_desc.c
@@ -27,9 +27,9 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
VERSION_2, entry_point_info_t,
SECURE | EXECUTABLE | EP_FIRST_EXE),
-#if !defined(AARCH32_SP_OPTEE)
+ /* Updated at runtime if OP-TEE is loaded */
.ep_info.pc = STM32MP_BL32_BASE,
-#endif
+
.ep_info.spsr = SPSR_MODE32(MODE32_svc, SPSR_T_ARM,
SPSR_E_LITTLE,
DISABLE_ALL_EXCEPTIONS),
@@ -37,14 +37,11 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
SET_STATIC_PARAM_HEAD(image_info, PARAM_EP,
VERSION_2, image_info_t,
IMAGE_ATTRIB_PLAT_SETUP),
-#if defined(AARCH32_SP_OPTEE)
- /* optee header is loaded in SYSRAM above BL2 */
- .image_info.image_base = STM32MP_OPTEE_BASE,
- .image_info.image_max_size = STM32MP_OPTEE_SIZE,
-#else
+
+ /* Updated at runtime if OP-TEE is loaded */
.image_info.image_base = STM32MP_BL32_BASE,
.image_info.image_max_size = STM32MP_BL32_SIZE,
-#endif
+
.next_handoff_image_id = BL33_IMAGE_ID,
},