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>

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>
Simon Glass · Tom Rini
1 parent cd2bee3544
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
arch/arm/mach-zynq/spl.c
@@ -20,7 +20,6 @@
 	/* 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 @@
 #ifdef CONFIG_SPL_BOARD_INIT
 void spl_board_init(void)
 {
+	preloader_console_init();
 	board_init();
 }
 #endif
...	...	@@ -20,7 +20,6 @@
20	20	/* Clear the BSS. */
21	21	memset(__bss_start, 0, __bss_end - __bss_start);
22	22
23		- preloader_console_init();
24	23	arch_cpu_init();
25	24	board_init_r(NULL, 0);
26	25	}
...	...	@@ -28,6 +27,7 @@
28	27	#ifdef CONFIG_SPL_BOARD_INIT
29	28	void spl_board_init(void)
30	29	{
	30	+ preloader_console_init();
31	31	board_init();
32	32	}
33	33	#endif