aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2012-08-05 07:31:33 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-08-14 00:36:29 +0200
commite57da5fd19e8fe36331ca6e37f65ac08ccd09ef9 (patch)
treec8d2f148099ed2701ce74e498b4ed956da61492e
parentf39524e8067a99b2898d48e94b3ddc03be369172 (diff)
downloadu-boot-linaro-stable-e57da5fd19e8fe36331ca6e37f65ac08ccd09ef9.tar.gz
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>
-rw-r--r--board/freescale/mx51evk/mx51evk.c10
-rw-r--r--include/configs/mx51evk.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index 514a7ac2a..97c8a2c8b 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 6af5ed7fe..635678a87 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -129,6 +129,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