diff options
author | Jimmy Brisson <jimmy.brisson@arm.com> | 2020-08-05 14:05:53 -0500 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-08-14 11:35:35 +0000 |
commit | d74c6b833616a9e3398352990af78098ea14cffa (patch) | |
tree | 33c088e5df18f59357ca142b886562ea7bfb6343 /plat/arm/common/arm_bl2_setup.c | |
parent | a6cccccd347c0eac7a77bc29d8e5f9591d08d4e1 (diff) | |
download | trusted-firmware-a-d74c6b833616a9e3398352990af78098ea14cffa.tar.gz |
Prevent colliding identifiers
There was a collision between the name of the typedef in the CASSERT and
something else, so we make the name of the typedef unique to the
invocation of DEFFINE_SVC_UUID2 by appending the name that's passed into
the macro. This eliminates the following MISRA violation:
bl1/bl1_main.c:233:[MISRA C-2012 Rule 5.6 (required)] Identifier
"invalid_svc_uuid" is already used to represent a typedef.
This also resolves MISRA rule 5.9.
These renamings are as follows:
* tzram -> secram. This matches the function call name as it has
sec_mem in it's name
* fw_config_base -> config_base. This file does not mess with
hw_conig, so there's little chance of confusion
Change-Id: I8734ba0956140c8e29b89d0596d10d61a6ef351e
Signed-off-by: Jimmy Brisson <jimmy.brisson@arm.com>
Diffstat (limited to 'plat/arm/common/arm_bl2_setup.c')
-rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index 60d8f6ef32..c90e93cd86 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -27,7 +27,7 @@ static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE); /* Base address of fw_config received from BL1 */ -static uintptr_t fw_config_base; +static uintptr_t config_base; /* * Check that BL2_BASE is above ARM_FW_CONFIG_LIMIT. This reserved page is @@ -66,7 +66,7 @@ void arm_bl2_early_platform_setup(uintptr_t fw_config, /* Setup the BL2 memory layout */ bl2_tzram_layout = *mem_layout; - fw_config_base = fw_config; + config_base = fw_config; /* Initialise the IO layer and register platform IO devices */ plat_arm_io_setup(); @@ -152,7 +152,7 @@ void bl2_plat_arch_setup(void) arm_bl2_plat_arch_setup(); /* Fill the properties struct with the info from the config dtb */ - fconf_populate("FW_CONFIG", fw_config_base); + fconf_populate("FW_CONFIG", config_base); /* TB_FW_CONFIG was also loaded by BL1 */ tb_fw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, TB_FW_CONFIG_ID); |