From mboxrd@z Thu Jan 1 00:00:00 1970 From: Fabio Estevam Date: Sun, 5 Aug 2012 14:31:34 -0300 Subject: [U-Boot] [PATCH 2/2] vision2: do not overwrite the console In-Reply-To: <1344187894-30940-1-git-send-email-festevam@gmail.com> References: <1344187894-30940-1-git-send-email-festevam@gmail.com> Message-ID: <1344187894-30940-2-git-send-email-festevam@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Fabio Estevam 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 0ed53d2..34fc1cb 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -215,6 +215,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 -- 1.7.1