Commit 490eeb04 authored by Daniel Boulby's avatar Daniel Boulby
Browse files

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: default avatarDaniel Boulby <daniel.boulby@arm.com>
parent 2a7c9e15
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* boot flow as the core comes up in aarch64 and to enter the BL32 image a warm * boot flow as the core comes up in aarch64 and to enter the BL32 image a warm
* reset in aarch32 state is required. * 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); int err = arm_bl2_handle_post_image_load(image_id);
......
...@@ -42,7 +42,7 @@ CASSERT(BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_bl2_base_overflows); ...@@ -42,7 +42,7 @@ CASSERT(BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_bl2_base_overflows);
#if LOAD_IMAGE_V2 #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 */ #else /* LOAD_IMAGE_V2 */
...@@ -328,11 +328,16 @@ int arm_bl2_handle_post_image_load(unsigned int image_id) ...@@ -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 * This function can be used by the platforms to update/use image
* information for given `image_id`. * 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); 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 */ #else /* LOAD_IMAGE_V2 */
/******************************************************************************* /*******************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment