From: Stefano Babic <sbabic@denx.de>
Date: Sun, 5 Aug 2012 00:18:53 +0000 (+0000)
Subject: MX5: mx53loco: do not overwrite the console
X-Git-Tag: v2012.10-rc1~265
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e0773708dd4e502c127a589be5779708eb7ba69;p=u-boot

MX5: mx53loco: 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: Stefano Babic <sbabic@denx.de>
CC: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
---

diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c
index cbdcfadf27..7cfb3f46a2 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/freescale/mx53loco/mx53loco.c
@@ -495,14 +495,14 @@ int print_cpuinfo(void)
 	return 0;
 }
 
-#ifdef CONFIG_BOARD_LATE_INIT
-int board_late_init(void)
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
 {
-	setenv("stdout", "serial");
-
-	return 0;
+	return 1;
 }
-#endif
 
 int board_init(void)
 {
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 597c4e45dd..24ec140149 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -221,6 +221,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