Merge pull request #1550 from danielboulby-arm/db/weakdefs
Prevent two weak definitions of the same function
This commit is contained in:
commit
5acb793288
|
@ -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);
|
||||||
|
|
||||||
#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)
|
||||||
* 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 */
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
|
|
Loading…
Reference in New Issue