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

fix(fvp): FCONF Trace Not Shown

Browse source 
Updating call order for arm_console_boot_init() and arm_bl31_early_platform_setup().

Signed-off-by:  Juan Pablo Conde <juanpablo.conde@arm.com>
Change-Id: If932fff2ee4282a0aacf8751fa81e7665b886467
This commit is contained in:
Juan Pablo Conde 2022-02-01 15:19:58 -05:00
parent 1842d1f48d
commit 0c55c10305
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plat/arm/board/fvp/fvp_bl31_setup.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -20,6 +20,9 @@
void __init bl31_early_platform_setup2(u_register_t arg0, void __init bl31_early_platform_setup2(u_register_t arg0,
u_register_t arg1, u_register_t arg2, u_register_t arg3) u_register_t arg1, u_register_t arg2, u_register_t arg3)
{ {
/* Initialize the console to provide early debug support */
arm_console_boot_init();
#if !RESET_TO_BL31 && !BL2_AT_EL3 #if !RESET_TO_BL31 && !BL2_AT_EL3
const struct dyn_cfg_dtb_info_t *soc_fw_config_info; const struct dyn_cfg_dtb_info_t *soc_fw_config_info;

7
plat/arm/common/arm_console.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -25,6 +25,11 @@ static console_t arm_runtime_console;
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
void __init arm_console_boot_init(void) void __init arm_console_boot_init(void)
{ {
/* If the console was initialized already, don't initialize again */
if (arm_boot_console.base == PLAT_ARM_BOOT_UART_BASE) {
return;
}
int rc = console_pl011_register(PLAT_ARM_BOOT_UART_BASE, int rc = console_pl011_register(PLAT_ARM_BOOT_UART_BASE,
PLAT_ARM_BOOT_UART_CLK_IN_HZ, PLAT_ARM_BOOT_UART_CLK_IN_HZ,
ARM_CONSOLE_BAUDRATE, ARM_CONSOLE_BAUDRATE,