diff mbox

[U-Boot,v4,2/6] davinci: ea20: the console is always set to the serial line

Message ID 1347611344-7483-2-git-send-email-Bastian.Ruppert@Sewerin.de
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Bastian Ruppert Sept. 14, 2012, 8:29 a.m. UTC 
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>
---
 board/davinci/ea20/ea20.c |   11 +++++++++--
 include/configs/ea20.h    |    2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c
index 69307e4..0edd910 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 a9caa81..f9a1462 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -125,6 +125,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
 
 /*