From a4ff9d7e1ee4ccd66824c1e4be08727012c99123 Mon Sep 17 00:00:00 2001 From: Manish V Badarkhe Date: Wed, 15 Jul 2020 04:27:57 +0100 Subject: [PATCH] lib/fconf: Update data type of config max size 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 --- include/lib/fconf/fconf_dyn_cfg_getter.h | 2 +- lib/fconf/fconf.c | 3 +-- lib/fconf/fconf_dyn_cfg_getter.c | 2 +- plat/arm/common/arm_dyn_cfg.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/lib/fconf/fconf_dyn_cfg_getter.h b/include/lib/fconf/fconf_dyn_cfg_getter.h index 9816d6fe0..6e0e7fd59 100644 --- a/include/lib/fconf/fconf_dyn_cfg_getter.h +++ b/include/lib/fconf/fconf_dyn_cfg_getter.h @@ -14,7 +14,7 @@ struct dyn_cfg_dtb_info_t { uintptr_t config_addr; - size_t config_max_size; + uint32_t config_max_size; unsigned int config_id; }; diff --git a/lib/fconf/fconf.c b/lib/fconf/fconf.c index bc4fa8ea8..24b6bcc55 100644 --- a/lib/fconf/fconf.c +++ b/lib/fconf/fconf.c @@ -32,8 +32,7 @@ int fconf_load_config(unsigned int image_id) assert(config_info != NULL); config_image_info.image_base = config_info->config_addr; - config_image_info.image_max_size = - (uint32_t)config_info->config_max_size; + config_image_info.image_max_size = config_info->config_max_size; VERBOSE("FCONF: Loading config with image ID: %d\n", image_id); err = load_auth_image(image_id, &config_image_info); diff --git a/lib/fconf/fconf_dyn_cfg_getter.c b/lib/fconf/fconf_dyn_cfg_getter.c index 16bbe42c8..38a85f526 100644 --- a/lib/fconf/fconf_dyn_cfg_getter.c +++ b/lib/fconf/fconf_dyn_cfg_getter.c @@ -125,7 +125,7 @@ int fconf_populate_dtb_registry(uintptr_t config) VERBOSE("FCONF: dyn_cfg.dtb_registry cell found with:\n"); 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); } diff --git a/plat/arm/common/arm_dyn_cfg.c b/plat/arm/common/arm_dyn_cfg.c index b31870b6d..6b3a61180 100644 --- a/plat/arm/common/arm_dyn_cfg.c +++ b/plat/arm/common/arm_dyn_cfg.c @@ -203,7 +203,7 @@ void arm_bl2_dyn_cfg_init(void) unsigned int i; bl_mem_params_node_t *cfg_mem_params = NULL; uintptr_t image_base; - size_t image_size; + uint32_t image_size; const unsigned int config_ids[] = { HW_CONFIG_ID, SOC_FW_CONFIG_ID,