Arm platforms: Fix max size of BL33 image

The BL33 image must not go past the end of DRAM.

Change-Id: I56668ab760d82332d69a8904d125d9a055aa91d5
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>

diff --git a/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c b/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c
index 0463bc022d8789b177d75edf6e093e4217e71d37..7aeeb2aeddff9bada9f48df477679345bebd2fb9 100644 (file)
--- a/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c
+++ b/plat/arm/common/aarch32/arm_bl2_mem_params_desc.c
@@ -80,7 +80,8 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
            SET_STATIC_PARAM_HEAD(image_info, PARAM_EP,
                    VERSION_2, image_info_t, 0),
            .image_info.image_base = PLAT_ARM_NS_IMAGE_BASE,
-           .image_info.image_max_size = ARM_DRAM1_SIZE,
+           .image_info.image_max_size = ARM_DRAM1_BASE + ARM_DRAM1_SIZE
+                   - PLAT_ARM_NS_IMAGE_BASE,
 #endif /* PRELOADED_BL33_BASE */
 
            .next_handoff_image_id = INVALID_IMAGE_ID,

diff --git a/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c b/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c
index 96f51137563d46c60ab6617ac9319d4f2f534332..0514b39945c96cab1befd432e1ee62ce1e0e12b1 100644 (file)
--- a/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c
+++ b/plat/arm/common/aarch64/arm_bl2_mem_params_desc.c
@@ -181,7 +181,8 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
            SET_STATIC_PARAM_HEAD(image_info, PARAM_EP,
                    VERSION_2, image_info_t, 0),
            .image_info.image_base = PLAT_ARM_NS_IMAGE_BASE,
-           .image_info.image_max_size = ARM_DRAM1_SIZE,
+           .image_info.image_max_size = ARM_DRAM1_BASE + ARM_DRAM1_SIZE
+                   - PLAT_ARM_NS_IMAGE_BASE,
 # endif /* PRELOADED_BL33_BASE */
 
            .next_handoff_image_id = INVALID_IMAGE_ID,