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 69307e459d4d10a2ebfbae8e3e82ea4569ab0668..0edd9102106d927c3a4d14f9d3bb1aeb8e6d7c5c 100644 (file)
--- 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 337d504923b618d165239ec0895172ecbde51b30..21aa4172497e0f0ae95687a4e004451ace6e2f50 100644 (file)
--- 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
 
 /*