aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2017-04-24 14:40:35 +0100
committerGitHub <noreply@github.com>2017-04-24 14:40:35 +0100
commitffc299f6d1ca36f19656dfd9b1274cfa6c6ed93f (patch)
tree711d58f1e98b0ef544ec76004879dd8e87f83d72 /common
parent0c7c44110e3637de573131ac25f33540c0a103ac (diff)
parentc2a9ee6383b71af2d0dae7b0c578e987bcf35695 (diff)
downloadtrusted-firmware-a-ffc299f6d1ca36f19656dfd9b1274cfa6c6ed93f.tar.gz
Merge pull request #911 from danh-arm/dh/refactor-bl2-image-load
Minor refactor of BL2 image load v2
Diffstat (limited to 'common')
-rw-r--r--common/desc_image_load.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/common/desc_image_load.c b/common/desc_image_load.c
index a9762b7170..52ef362b3c 100644
--- a/common/desc_image_load.c
+++ b/common/desc_image_load.c
@@ -47,8 +47,11 @@ static bl_params_t next_bl_params;
******************************************************************************/
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);
+
+ 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 */
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;
}