Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-27 15:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #911 from danh-arm/dh/refactor-bl2-image-load

Browse source 
Minor refactor of BL2 image load v2
This commit is contained in:
davidcunado-arm 2017-04-24 14:40:35 +01:00 • committed by GitHub
commit ffc299f6d1
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bl2/bl2_image_load_v2.c
View file

@ -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->head);
assert(bl2_to_next_bl_params->h.type == PARAM_BL_PARAMS); 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->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 */ /* Flush the parameters to be passed to next image */
plat_flush_next_bl_params(); plat_flush_next_bl_params();

12
common/desc_image_load.c
View file

@ -47,8 +47,11 @@ static bl_params_t next_bl_params;
******************************************************************************/ ******************************************************************************/
void flush_bl_params_desc(void) void flush_bl_params_desc(void)
{ {
flush_dcache_range((unsigned long)bl_mem_params_desc_ptr, flush_dcache_range((uintptr_t)bl_mem_params_desc_ptr,
sizeof(*bl_mem_params_desc_ptr) * bl_mem_params_desc_num); sizeof(*bl_mem_params_desc_ptr) * bl_mem_params_desc_num);
flush_dcache_range((uintptr_t)&next_bl_params,
sizeof(next_bl_params));
} }
/******************************************************************************* /*******************************************************************************
@ -209,12 +212,5 @@ bl_params_t *get_next_bl_params_from_mem_params_desc(void)
/* Invalid image is expected to terminate the loop */ /* Invalid image is expected to terminate the loop */
assert(img_id == INVALID_IMAGE_ID); assert(img_id == INVALID_IMAGE_ID);
/* Populate arg0 for the next BL image */
next_bl_params.head->ep_info->args.arg0 = (unsigned long)&next_bl_params;
/* Flush the parameters to be passed to the next BL image */
flush_dcache_range((unsigned long)&next_bl_params,
sizeof(next_bl_params));
return &next_bl_params; return &next_bl_params;
} }