On this board, the console is always set to the serial line. Do not allow to overwrite it when video is enabled.

Signed-off-by: Stefano Babic sbabic@denx.de CC: Fabio Estevam fabio.estevam@freescale.com --- board/freescale/mx53loco/mx53loco.c | 12 ++++++------ include/configs/mx53loco.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index cbdcfad..7cfb3f4 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -495,14 +495,14 @@ int print_cpuinfo(void) return 0; }

-#ifdef CONFIG_BOARD_LATE_INIT -int board_late_init(void) +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) { - setenv("stdout", "serial"); - - return 0; + return 1; } -#endif

int board_init(void) { diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 0a25c7d..f4b43ee 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -222,6 +222,8 @@ #define CONFIG_VIDEO_IPUV3 #define CONFIG_CFB_CONSOLE #define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN #define CONFIG_BMP_16BPP