Message ID | 1440795028-7303-8-git-send-email-sjg@chromium.org |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On 08/28/2015 10:50 PM, Simon Glass wrote: > We should not init the console this early and there is no need to. If we want > to do early init 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> > --- > > Changes in v2: None > > arch/arm/mach-zynq/spl.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 > Tested-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
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