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

Update comments in load_image()

Browse source 
- Fix the function documentation.
  Since commit 16948ae1, load_image() uses image IDs rather than image
  names.

- Clarify the consequences of a null entry point argument.

- Slightly reorganize the code to remove an unnecessary 'if' statement.

Change-Id: Iebea3149a37f23d3b847a37a206ed23f7e8ec717
This commit is contained in:
Sandrine Bailleux 2016-05-27 14:08:10 +01:00
parent 11ec6c598f
commit a6b995fba3
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/bl_common.c
View file

@ -189,12 +189,20 @@ unsigned long image_size(unsigned int image_id)
} }
/******************************************************************************* /*******************************************************************************
* Generic function to load an image at a specific address given a name and * Generic function to load an image at a specific address given an image ID and
* extents of free memory. It updates the memory layout if the load is * extents of free memory.
* successful, as well as the image information and the entry point information. *
* The caller might pass a NULL pointer for the entry point if it is not * If the load is successful then the image information is updated.
* interested in this information, e.g. because the image just needs to be *
* loaded in memory but won't ever be executed. * If the entry_point_info argument is not NULL then this function also updates:
* - the memory layout to mark the memory as reserved;
* - the entry point information.
*
* The caller might pass a NULL pointer for the entry point if they are not
* interested in this information. This is typically the case for non-executable
* images (e.g. certificates) and executable images that won't ever be executed
* on the application processor (e.g. additional microcontroller firmware).
*
* Returns 0 on success, a negative error code otherwise. * Returns 0 on success, a negative error code otherwise.
******************************************************************************/ ******************************************************************************/
int load_image(meminfo_t *mem_layout, int load_image(meminfo_t *mem_layout,
@ -259,6 +267,9 @@ int load_image(meminfo_t *mem_layout,
goto exit; goto exit;
} }
image_data->image_base = image_base;
image_data->image_size = image_size;
/* /*
* Update the memory usage info. * Update the memory usage info.
* This is done after the actual loading so that it is not updated when * This is done after the actual loading so that it is not updated when
@ -269,20 +280,16 @@ int load_image(meminfo_t *mem_layout,
if (entry_point_info != NULL) { if (entry_point_info != NULL) {
reserve_mem(&mem_layout->free_base, &mem_layout->free_size, reserve_mem(&mem_layout->free_base, &mem_layout->free_size,
image_base, image_size); image_base, image_size);
entry_point_info->pc = image_base;
} else { } else {
INFO("Skip reserving memory: %p - %p\n", (void *) image_base, INFO("Skip reserving memory: %p - %p\n", (void *) image_base,
(void *) (image_base + image_size)); (void *) (image_base + image_size));
} }
image_data->image_base = image_base;
image_data->image_size = image_size;
if (entry_point_info != NULL)
entry_point_info->pc = image_base;
/* /*
* File has been successfully loaded. * File has been successfully loaded.
* Flush the image in TZRAM so that the next EL can see it. * Flush the image in Trusted SRAM so that the next exception level can
* see it.
*/ */
flush_dcache_range(image_base, image_size); flush_dcache_range(image_base, image_size);