From fca37fcde1c3485a28ade8329ca54130d9d4ea2a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 5 Aug 2012 07:31:34 +0000 Subject: [PATCH] vision2: do not overwrite the console 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: Fabio Estevam --- board/ttcontrol/vision2/vision2.c | 11 +++++++++-- include/configs/vision2.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index d68bef7..d287544 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -674,11 +674,18 @@ int board_late_init(void) udelay(2000); #endif - setenv("stdout", "serial"); - return 0; } +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int checkboard(void) { puts("Board: TTControl Vision II CPU V\n"); diff --git a/include/configs/vision2.h b/include/configs/vision2.h index ed004a6..f3e8491 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -214,6 +214,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_CMD_BMP