From: Sandy Patterson Date: Wed, 10 Aug 2016 14:21:47 +0000 (-0400) Subject: rockchip: Fix SPL console output when ROCKCHIP_SPL_BACK_TO_BROM is enabled X-Git-Tag: v2016.11-rc1~1^2~15 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=427351dc1d054b6d92814017f3ea6694474949b7;p=u-boot rockchip: Fix SPL console output when ROCKCHIP_SPL_BACK_TO_BROM is enabled Move back_to_bootrom() call later in SPL init so that the console is initialized and printouts happen. Currently when ROCKCHIP_SPL_BACK_TO_BROM is enabled there is no console output from the SPL init stages. I wasn't sure exactly where this should happen, so if we are set to do run spl_board_init, then go back to bootrom there after preloader_console_init(). Otherwise fall back to old behavior of doing it in board_init_f. Signed-off-by: Sandy Patterson Acked-by: Ziyuan Xu Acked-by: Simon Glass --- diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c index ae509ffab2..0f40351769 100644 --- a/arch/arm/mach-rockchip/rk3288-board-spl.c +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c @@ -206,7 +206,7 @@ void board_init_f(ulong dummy) debug("DRAM init failed: %d\n", ret); return; } -#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM +#if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT) back_to_bootrom(); #endif } @@ -273,6 +273,9 @@ void spl_board_init(void) } preloader_console_init(); +#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM + back_to_bootrom(); +#endif return; err: printf("spl_board_init: Error %d\n", ret);