From 875423de49646402cd6a7c1850f52982a3b56299 Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Fri, 3 Jan 2025 13:30:39 +0100 Subject: [PATCH] fix(arm): use EL3_PAS in MAP_BL2_TOTAL definition Similarly to BL1 and BL31, use EL3_PAS macro from xlat_tables header (depends on ENABLE_RME) in BL2 to define MAP_BL2_TOTAL. Signed-off-by: Olivier Deprez Change-Id: I59a3b297efd2eacd082a297de6b579b7c9052883 --- plat/arm/common/arm_bl2_setup.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index 07b3b6203..17dc0ed29 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -52,17 +52,10 @@ CASSERT(BL2_BASE >= ARM_FW_CONFIG_LIMIT, assert_bl2_base_overflows); #pragma weak bl2_plat_arch_setup #pragma weak bl2_plat_sec_mem_layout -#if ENABLE_RME #define MAP_BL2_TOTAL MAP_REGION_FLAT( \ bl2_tzram_layout.total_base, \ bl2_tzram_layout.total_size, \ - MT_MEMORY | MT_RW | MT_ROOT) -#else -#define MAP_BL2_TOTAL MAP_REGION_FLAT( \ - bl2_tzram_layout.total_base, \ - bl2_tzram_layout.total_size, \ - MT_MEMORY | MT_RW | MT_SECURE) -#endif /* ENABLE_RME */ + MT_MEMORY | MT_RW | EL3_PAS) #pragma weak arm_bl2_plat_handle_post_image_load