From: Simon Glass <sjg@chromium.org>
Date: Sun, 19 Mar 2017 18:59:21 +0000 (-0600)
Subject: x86: Display the SPL banner only once
X-Git-Tag: v2017.05-rc3~62^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ff0900aafb34b32a0f72527f166ae45ed73be7c;p=oweals%2Fu-boot.git

x86: Display the SPL banner only once

At present on a cold reboot we must reset the CPU to get it to full speed.
With 64-bit U-Boot this happens in SPL. At present we print the banner
before doing this, the end result being that we print the banner twice.
Print the banner a little later (after the CPU is ready) to avoid this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 2b1b450737..832a5d7c0e 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -37,8 +37,6 @@ static int x86_spl_init(void)
 		debug("%s: spl_init() failed\n", __func__);
 		return ret;
 	}
-	preloader_console_init();
-
 	ret = arch_cpu_init();
 	if (ret) {
 		debug("%s: arch_cpu_init() failed\n", __func__);
@@ -49,6 +47,7 @@ static int x86_spl_init(void)
 		debug("%s: arch_cpu_init_dm() failed\n", __func__);
 		return ret;
 	}
+	preloader_console_init();
 	ret = print_cpuinfo();
 	if (ret) {
 		debug("%s: print_cpuinfo() failed\n", __func__);