diff options
| author | Fabio Estevam | 2012-08-05 07:31:33 +0000 |
|---|---|---|
| committer | Albert ARIBAUD | 2012-09-01 14:58:18 +0200 |
| commit | 1e080988d035ed4c472e613462a3bc9f64108a3a (patch) | |
| tree | b1fadccb89554dffef6cbd0d2c0c32736bc25e86 | |
| parent | 3e0773708dd4e502c127a589be5779708eb7ba69 (diff) | |
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.c | 10 | ||||
| -rw-r--r-- | include/configs/mx51evk.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 514a7ac2ad9..97c8a2c8b15 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 e975f549bdb..29ba24e0d54 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 |