Tegra: Fix up INFO() message
With commit cf24229e6e
("Run compiler on debug macros for type
checking"), the compiler will now always evaluate INFO() macro
calls, no matter the LOG_LEVEL value. Therefore, any variable
referenced in the macro has to be be defined.
Address this issue by removing the local variable and using the
expression it was assigned directly in the INFO() call.
Change-Id: Iedc23b3538c1e162372e85390881e50718e50bf3
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
This commit is contained in:
parent
6f4ee72083
commit
c426fd709f
|
@ -116,9 +116,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
|
||||||
{
|
{
|
||||||
plat_params_from_bl2_t *plat_params =
|
plat_params_from_bl2_t *plat_params =
|
||||||
(plat_params_from_bl2_t *)plat_params_from_bl2;
|
(plat_params_from_bl2_t *)plat_params_from_bl2;
|
||||||
#if LOG_LEVEL >= LOG_LEVEL_INFO
|
|
||||||
int impl = (read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK;
|
|
||||||
#endif
|
|
||||||
image_info_t bl32_img_info = { {0} };
|
image_info_t bl32_img_info = { {0} };
|
||||||
uint64_t tzdram_start, tzdram_end, bl32_start, bl32_end;
|
uint64_t tzdram_start, tzdram_end, bl32_start, bl32_end;
|
||||||
|
|
||||||
|
@ -227,8 +224,9 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
|
||||||
/* Early platform setup for Tegra SoCs */
|
/* Early platform setup for Tegra SoCs */
|
||||||
plat_early_platform_setup();
|
plat_early_platform_setup();
|
||||||
|
|
||||||
INFO("BL3-1: Boot CPU: %s Processor [%lx]\n", (impl == DENVER_IMPL) ?
|
INFO("BL3-1: Boot CPU: %s Processor [%lx]\n",
|
||||||
"Denver" : "ARM", read_mpidr());
|
(((read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK)
|
||||||
|
== DENVER_IMPL) ? "Denver" : "ARM", read_mpidr());
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SPD_trusty
|
#ifdef SPD_trusty
|
||||||
|
|
Loading…
Reference in New Issue