mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-18 02:24:18 +00:00
fix(versal2): variable conflicting with external linkage
This corrects the MISRA violation C2012-5.8: Identifiers that define objects or functions with external linkage shall be unique. Modify the variable name to prevent conflict with external object linkage. Change-Id: I2448e4ad0660e654ceb40940e0046d2f2899b41b Signed-off-by: Maheedhar Bollapalli <maheedharsai.bollapalli@amd.com>
This commit is contained in:
parent
4d2b4e4dd7
commit
ca39fd46c1
2 changed files with 7 additions and 7 deletions
|
@ -72,11 +72,11 @@ const char *board_name_decode(void)
|
|||
|
||||
void board_detection(void)
|
||||
{
|
||||
uint32_t version;
|
||||
uint32_t version_type;
|
||||
|
||||
version = mmio_read_32(PMC_TAP_VERSION);
|
||||
platform_id = FIELD_GET(PLATFORM_MASK, version);
|
||||
platform_version = FIELD_GET(PLATFORM_VERSION_MASK, version);
|
||||
version_type = mmio_read_32(PMC_TAP_VERSION);
|
||||
platform_id = FIELD_GET(PLATFORM_MASK, version_type);
|
||||
platform_version = FIELD_GET(PLATFORM_VERSION_MASK, version_type);
|
||||
|
||||
if (platform_id == QEMU_COSIM) {
|
||||
platform_id = QEMU;
|
||||
|
|
|
@ -222,11 +222,11 @@ static uint64_t no_pm_handler(uint32_t smc_fid, uint64_t x1, uint64_t x2, uint64
|
|||
}
|
||||
case PM_GET_CHIPID:
|
||||
{
|
||||
uint32_t idcode, version;
|
||||
uint32_t idcode, version_type;
|
||||
|
||||
idcode = mmio_read_32(PMC_TAP);
|
||||
version = mmio_read_32(PMC_TAP_VERSION);
|
||||
SMC_RET2(handle, ((uint64_t)idcode << 32), version);
|
||||
version_type = mmio_read_32(PMC_TAP_VERSION);
|
||||
SMC_RET2(handle, ((uint64_t)idcode << 32), version_type);
|
||||
}
|
||||
default:
|
||||
WARN("Unimplemented PM Service Call: 0x%x\n", smc_fid);
|
||||
|
|
Loading…
Add table
Reference in a new issue