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

lib/fconf: Update data type of config max size

Browse source 
Update the data type of the member 'config_max_size' present in the
structure 'dyn_cfg_dtb_info_t' to uint32_t.

This change is being done so that dyn_cfg_dtb_info_t and image_info
structure should use same data type for maximum size.

Change-Id: I9b5927a47eb8351bbf3664b8b1e047ae1ae5a260
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
This commit is contained in:
Manish V Badarkhe 2020-07-15 04:27:57 +01:00 • committed by Manish V Badarkhe
parent a249a9d9e7
commit a4ff9d7e1e
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/lib/fconf/fconf_dyn_cfg_getter.h
View file

@ -14,7 +14,7 @@
struct dyn_cfg_dtb_info_t { struct dyn_cfg_dtb_info_t {
uintptr_t config_addr; uintptr_t config_addr;
size_t config_max_size; uint32_t config_max_size;
unsigned int config_id; unsigned int config_id;
}; };

3
lib/fconf/fconf.c
View file

@ -32,8 +32,7 @@ int fconf_load_config(unsigned int image_id)
assert(config_info != NULL); assert(config_info != NULL);
config_image_info.image_base = config_info->config_addr; config_image_info.image_base = config_info->config_addr;
config_image_info.image_max_size = config_image_info.image_max_size = config_info->config_max_size;
(uint32_t)config_info->config_max_size;
VERBOSE("FCONF: Loading config with image ID: %d\n", image_id); VERBOSE("FCONF: Loading config with image ID: %d\n", image_id);
err = load_auth_image(image_id, &config_image_info); err = load_auth_image(image_id, &config_image_info);

2
lib/fconf/fconf_dyn_cfg_getter.c
View file

@ -125,7 +125,7 @@ int fconf_populate_dtb_registry(uintptr_t config)
VERBOSE("FCONF: dyn_cfg.dtb_registry cell found with:\n"); VERBOSE("FCONF: dyn_cfg.dtb_registry cell found with:\n");
VERBOSE("\tload-address = %lx\n", dtb_info->config_addr); VERBOSE("\tload-address = %lx\n", dtb_info->config_addr);
VERBOSE("\tmax-size = 0x%zx\n", dtb_info->config_max_size); VERBOSE("\tmax-size = 0x%x\n", dtb_info->config_max_size);
VERBOSE("\tconfig-id = %u\n", dtb_info->config_id); VERBOSE("\tconfig-id = %u\n", dtb_info->config_id);
} }

2
plat/arm/common/arm_dyn_cfg.c
View file

@ -203,7 +203,7 @@ void arm_bl2_dyn_cfg_init(void)
unsigned int i; unsigned int i;
bl_mem_params_node_t *cfg_mem_params = NULL; bl_mem_params_node_t *cfg_mem_params = NULL;
uintptr_t image_base; uintptr_t image_base;
size_t image_size; uint32_t image_size;
const unsigned int config_ids[] = { const unsigned int config_ids[] = {
HW_CONFIG_ID, HW_CONFIG_ID,
SOC_FW_CONFIG_ID, SOC_FW_CONFIG_ID,