summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-10-19 06:50:02 -0600
committerTom Rini <trini@konsulko.com>2015-10-24 13:50:37 -0400
commit5fa030b9f013cba7e170043bf371a0a32d8c07c8 (patch)
treece2b14266aece8335cfa38f0ba280a267387dec2 /arch
parentcd2bee3544095d8b3887e140b27b47246f6b379d (diff)
downloadu-boot-imx-5fa030b9f013cba7e170043bf371a0a32d8c07c8.zip
u-boot-imx-5fa030b9f013cba7e170043bf371a0a32d8c07c8.tar.gz
u-boot-imx-5fa030b9f013cba7e170043bf371a0a32d8c07c8.tar.bz2
zynq: Move SPL console init out of board_init_f()
We should not init the console this early since it precludes using driver model for the UART, since it is not set up at the start of board_init_f(). See the README for more information. The debug UART does not have this restriction. If we want to do early init with the console on it can be done in spl_board_init(). Move the preloader_console_init() call from board_init_f() to board_init_r(). Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-zynq/spl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index e7df6d3..7bdac3b 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -20,7 +20,6 @@ void board_init_f(ulong dummy)
/* Clear the BSS. */
memset(__bss_start, 0, __bss_end - __bss_start);
- preloader_console_init();
arch_cpu_init();
board_init_r(NULL, 0);
}
@@ -28,6 +27,7 @@ void board_init_f(ulong dummy)
#ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void)
{
+ preloader_console_init();
board_init();
}
#endif