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

mx51evk: 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/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 514a7ac2ad..97c8a2c8b1 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -536,12 +536,20 @@ int board_late_init(void)
 	setup_iomux_spi();
 	power_init();
 #endif
-	setenv("stdout", "serial");
 
 	return 0;
 }
 #endif
 
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+	return 1;
+}
+
 int checkboard(void)
 {
 	puts("Board: MX51EVK\n");
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index e975f549bd..29ba24e0d5 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -128,6 +128,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_BMP_16BPP