diff options
author | davidcunado-arm <david.cunado@arm.com> | 2018-02-07 11:57:19 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 11:57:19 +0800 |
commit | 5b75b4a725d062bd593856a665bfda0e1b23a04b (patch) | |
tree | afc86aa95f7073042803ed9f5938020d19ecb369 /bl2/bl2_image_load_v2.c | |
parent | 9fd2f13bd608832260300640970f73c62357c684 (diff) | |
parent | 95ae5b00447da02695a653004b86e6b805e058a9 (diff) | |
download | trusted-firmware-a-5b75b4a725d062bd593856a665bfda0e1b23a04b.tar.gz |
Merge pull request #1173 from etienne-lms/armv7-qemu
support to boot OP-TEE on AArch32/Armv7+example with Cortex-A15/Qemu
Diffstat (limited to 'bl2/bl2_image_load_v2.c')
-rw-r--r-- | bl2/bl2_image_load_v2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bl2/bl2_image_load_v2.c b/bl2/bl2_image_load_v2.c index ebbad45e04..f51dea80c7 100644 --- a/bl2/bl2_image_load_v2.c +++ b/bl2/bl2_image_load_v2.c @@ -93,8 +93,10 @@ entry_point_info_t *bl2_load_images(void) assert(bl2_to_next_bl_params->h.version >= VERSION_2); assert(bl2_to_next_bl_params->head->ep_info); - /* Populate arg0 for the next BL image */ - bl2_to_next_bl_params->head->ep_info->args.arg0 = (u_register_t)bl2_to_next_bl_params; + /* Populate arg0 for the next BL image if not already provided */ + if (bl2_to_next_bl_params->head->ep_info->args.arg0 == (u_register_t)0) + bl2_to_next_bl_params->head->ep_info->args.arg0 = + (u_register_t)bl2_to_next_bl_params; /* Flush the parameters to be passed to next image */ plat_flush_next_bl_params(); |