From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Sun, 5 Aug 2012 07:31:34 +0000 (+0000)
Subject: vision2: do not overwrite the console
X-Git-Tag: v2012.10-rc1~263
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fca37fcde1c3485a28ade8329ca54130d9d4ea2a;p=u-boot

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 <fabio.estevam@freescale.com>
---

diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c
index d68bef78f8..d2875444b4 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 ed004a659c..f3e8491fe6 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