diff options
| author | Scott Branden <sbranden@users.noreply.github.com> | 2017-04-29 08:36:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 08:36:12 -0700 |
| commit | 0f22bef31d402e24fab77eb2a3c643d042b7e79c (patch) | |
| tree | 6595ed7f87249ccbd4a953ba5cdc00963a130d18 /bl2/bl2_image_load_v2.c | |
| parent | 53d9c9c85bc49845c4c40315e1ab29d627a1f8c3 (diff) | |
| parent | dd454b40dfe42dbf77e2f04a3965295380b4f78d (diff) | |
Merge branch 'integration' into tf_issue_461
Diffstat (limited to 'bl2/bl2_image_load_v2.c')
| -rw-r--r-- | bl2/bl2_image_load_v2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bl2/bl2_image_load_v2.c b/bl2/bl2_image_load_v2.c index 4fab6556..05c0fcd2 100644 --- a/bl2/bl2_image_load_v2.c +++ b/bl2/bl2_image_load_v2.c @@ -109,6 +109,10 @@ entry_point_info_t *bl2_load_images(void) assert(bl2_to_next_bl_params->head); assert(bl2_to_next_bl_params->h.type == PARAM_BL_PARAMS); 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; /* Flush the parameters to be passed to next image */ plat_flush_next_bl_params(); |