vision2: do not overwrite the console
authorFabio Estevam <fabio.estevam@freescale.com>
Sun, 5 Aug 2012 07:31:34 +0000 (07:31 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 1 Sep 2012 12:58:18 +0000 (14:58 +0200)
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>
board/ttcontrol/vision2/vision2.c
include/configs/vision2.h

index d68bef78f883aa7ffd882c93fbb0109ca8b82427..d2875444b4e292e3123e93fa43593f3508ce9a88 100644 (file)
@@ -674,11 +674,18 @@ int board_late_init(void)
        udelay(2000);
 #endif
 
-       setenv("stdout", "serial");
-
        return 0;
 }
 
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+       return 1;
+}
+
 int checkboard(void)
 {
        puts("Board: TTControl Vision II CPU V\n");
index ed004a659c82877de0ea13cbce2d1b75bda437c8..f3e8491fe6496c13b9cd7b02c4c9905d677d7d89 100644 (file)
 #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_CMD_BMP