From 490eeb04e63e271941a6075dfef48c80b251e6bc Mon Sep 17 00:00:00 2001 From: Daniel Boulby Date: Wed, 27 Jun 2018 16:45:48 +0100 Subject: [PATCH] Prevent two weak definitions of the same function Add another level of abstraction of weak defs for arm_bl2_handle_post_image_load to prevent two weak definitions of the same function Change-Id: Ie953786f43b0f88257c82956ffaa5fe0d19603db Signed-off-by: Daniel Boulby --- plat/arm/board/juno/juno_bl2_setup.c | 2 +- plat/arm/common/arm_bl2_setup.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plat/arm/board/juno/juno_bl2_setup.c b/plat/arm/board/juno/juno_bl2_setup.c index cedef66c9..1f483d63d 100644 --- a/plat/arm/board/juno/juno_bl2_setup.c +++ b/plat/arm/board/juno/juno_bl2_setup.c @@ -16,7 +16,7 @@ * boot flow as the core comes up in aarch64 and to enter the BL32 image a warm * reset in aarch32 state is required. ******************************************************************************/ -int bl2_plat_handle_post_image_load(unsigned int image_id) +int arm_bl2_plat_handle_post_image_load(unsigned int image_id) { int err = arm_bl2_handle_post_image_load(image_id); diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index 01ae8f348..a8ea075d8 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -42,7 +42,7 @@ CASSERT(BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_bl2_base_overflows); #if LOAD_IMAGE_V2 -#pragma weak bl2_plat_handle_post_image_load +#pragma weak arm_bl2_plat_handle_post_image_load #else /* LOAD_IMAGE_V2 */ @@ -328,11 +328,16 @@ int arm_bl2_handle_post_image_load(unsigned int image_id) * This function can be used by the platforms to update/use image * information for given `image_id`. ******************************************************************************/ -int bl2_plat_handle_post_image_load(unsigned int image_id) +int arm_bl2_plat_handle_post_image_load(unsigned int image_id) { return arm_bl2_handle_post_image_load(image_id); } +int bl2_plat_handle_post_image_load(unsigned int image_id) +{ + return arm_bl2_plat_handle_post_image_load(image_id); +} + #else /* LOAD_IMAGE_V2 */ /*******************************************************************************