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

Merge changes from topic "css_refactor_arm" into integration

Browse source 
* changes:
  refactor(allwinner): console runtime switch on bl31 exit
  refactor(arm): console runtime switch on bl31 exit
  refactor(console): flush before console_switch_state
This commit is contained in:
Manish Pandey 2024-03-04 21:53:25 +01:00 • committed by TrustedFirmware Code Review
commit 4d5dcff08e
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plat/allwinner/common/sunxi_bl31_setup.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017-2022, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2017-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -187,6 +187,7 @@ void bl31_plat_runtime_setup(void)
/* Change the DTB if the configuration requires so. */
sunxi_prepare_dtb(fdt);
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}

4
plat/arm/board/tc/tc_bl31_setup.c
View file

@ -154,10 +154,10 @@ void __init bl31_plat_arch_setup(void)
#if defined(SPD_spmd) && (SPMC_AT_EL3 == 0)
void tc_bl31_plat_runtime_setup(void)
{
arm_bl31_plat_runtime_setup();
/* Start secure watchdog timer. */
plat_arm_secure_wdt_start();
arm_bl31_plat_runtime_setup();
}
void bl31_plat_runtime_setup(void)

8
plat/arm/common/arm_bl31_setup.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2023, Arm Limited and Contributors. All rights reserved.
* Copyright (c) 2015-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -325,12 +325,9 @@ void arm_bl31_platform_setup(void)
/*******************************************************************************
* Perform any BL31 platform runtime setup prior to BL31 exit common to ARM
* standard platforms
* Perform BL31 platform setup
******************************************************************************/
void arm_bl31_plat_runtime_setup(void)
{
console_switch_state(CONSOLE_FLAG_RUNTIME);
/* Initialize the runtime console */
arm_console_runtime_init();
@ -341,6 +338,9 @@ void arm_bl31_plat_runtime_setup(void)
#if PLAT_RO_XLAT_TABLES
arm_xlat_make_tables_readonly();
#endif
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}
#if RECLAIM_INIT_CODE

3
plat/common/aarch64/plat_common.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014-2023, Arm Limited and Contributors. All rights reserved.
* Copyright (c) 2014-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -35,6 +35,7 @@
void bl31_plat_runtime_setup(void)
{
console_flush();
console_switch_state(CONSOLE_FLAG_RUNTIME);
}