Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Ensure SPL banner is only shown once

Browse source 
Print the banner in SPL init only if the spl_board_init() function isn't
enabled. The spl_board_init() function is in the same file, but is called
later, by board_init_r().

This avoids printing two banners, which causes tests to fail.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2023-07-15 21:39:00 -06:00 committed by Bin Meng
parent 03fe79c091
commit 3525258019
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/lib/spl.c
View file

@ -97,7 +97,13 @@ static int x86_spl_init(void)
return ret;
}
#endif
preloader_console_init();
/*
* spl_board_init() below sets up the console if enabled. If it isn't,
* do it here. We cannot call this twice since it results in a double
* banner and CI tests fail.
*/
if (!IS_ENABLED(CONFIG_SPL_BOARD_INIT))
preloader_console_init();
#if !defined(CONFIG_TPL) && !CONFIG_IS_ENABLED(CPU)
ret = print_cpuinfo();
if (ret) {