x86: Ensure SPL banner is only shown once

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>

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index b9d23e6bfe18be4c8ef88df20bc6f101b1790b61..f27501875eccb6fd6b14701d89c4af0f9d1f7417 100644 (file)
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -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) {