andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1550 from danielboulby-arm/db/weakdefs 

Prevent two weak definitions of the same function
This commit is contained in:
Dimitris Papastamos 2018-08-31 13:18:18 +01:00 committed by GitHub
parent 708531cf05 490eeb04e6
commit 5acb793288
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/arm/board/juno/juno_bl2_setup.c
View File

@ -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);

9
plat/arm/common/arm_bl2_setup.c
View File

@ -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 */
/******************************************************************************* /*******************************************************************************