From: Bastian Ruppert <Bastian.Ruppert@Sewerin.de>
Date: Thu, 13 Sep 2012 22:29:00 +0000 (+0000)
Subject: davinci: ea20: the console is always set to the serial line
X-Git-Tag: v2012.10-rc3~15^2~62
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=39e133d1962bd90c136460f0053dcd184feb053c;p=u-boot

davinci: ea20: the console is always set to the serial line

Do not allow to overwrite it when video is enabled.

Signed-off-by: Bastian Ruppert <Bastian.Ruppert@Sewerin.de>
CC: Tom Rini <trini@ti.com>
Acked-by: Stefano Babic <sbabic@denx.de>
---

diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c
index 69307e459d..0edd910210 100644
--- a/board/davinci/ea20/ea20.c
+++ b/board/davinci/ea20/ea20.c
@@ -254,6 +254,15 @@ int board_early_init_f(void)
 	return 0;
 }
 
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+	return 1;
+}
+
 int board_init(void)
 {
 	/* arch number of the board */
@@ -281,8 +290,6 @@ int board_late_init(void)
 	/* Set HALTEN to high */
 	gpio_direction_output(134, 1);
 
-	setenv("stdout", "serial");
-
 	/* Set fixed contrast settings for LCD via I2C potentiometer */
 	buf[0] = 0x00;
 	buf[1] = 0xd7;
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 337d504923..21aa417249 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -124,6 +124,8 @@
 #define CONFIG_VIDEO_LOGO
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
 #endif
 
 /*