diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-08-05 00:18:53 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-01 14:58:18 +0200 |
| commit | 3e0773708dd4e502c127a589be5779708eb7ba69 (patch) | |
| tree | cf31fd8489338e762e75f9267fce1dc4c31e5eec | |
| parent | abb85be793180bdc0d9e30afe6c762669a5e0014 (diff) | |
| download | u-boot-imx-3e0773708dd4e502c127a589be5779708eb7ba69.zip u-boot-imx-3e0773708dd4e502c127a589be5779708eb7ba69.tar.gz u-boot-imx-3e0773708dd4e502c127a589be5779708eb7ba69.tar.bz2 | |
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>
| -rw-r--r-- | board/freescale/mx53loco/mx53loco.c | 12 | ||||
| -rw-r--r-- | include/configs/mx53loco.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index cbdcfad..7cfb3f4 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 597c4e4..24ec140 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 |