diff options
| author | Bastian Ruppert <Bastian.Ruppert@Sewerin.de> | 2012-09-13 22:29:00 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-01 10:02:13 -0700 |
| commit | 39e133d1962bd90c136460f0053dcd184feb053c (patch) | |
| tree | ad6c835e49bc567d422ecb08279a144e5bf61762 | |
| parent | bdb04abe42d808223bec5c9e589109b5d3953a97 (diff) | |
| download | u-boot-imx-39e133d1962bd90c136460f0053dcd184feb053c.zip u-boot-imx-39e133d1962bd90c136460f0053dcd184feb053c.tar.gz u-boot-imx-39e133d1962bd90c136460f0053dcd184feb053c.tar.bz2 | |
davinci: ea20: the console is always set to the serial line
Do not allow to overwrite it when video is enabled.
Signed-off-by: Bastian Ruppert <Bastian.Ruppert@Sewerin.de>
CC: Tom Rini <trini@ti.com>
Acked-by: Stefano Babic <sbabic@denx.de>
| -rw-r--r-- | board/davinci/ea20/ea20.c | 11 | ||||
| -rw-r--r-- | include/configs/ea20.h | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c index 69307e4..0edd910 100644 --- a/board/davinci/ea20/ea20.c +++ b/board/davinci/ea20/ea20.c @@ -254,6 +254,15 @@ int board_early_init_f(void) return 0; } +/* + * Do not overwrite the console + * Use always serial for U-Boot console + */ +int overwrite_console(void) +{ + return 1; +} + int board_init(void) { /* arch number of the board */ @@ -281,8 +290,6 @@ int board_late_init(void) /* Set HALTEN to high */ gpio_direction_output(134, 1); - setenv("stdout", "serial"); - /* Set fixed contrast settings for LCD via I2C potentiometer */ buf[0] = 0x00; buf[1] = 0xd7; diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 337d504..21aa417 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -124,6 +124,8 @@ #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_CMD_BMP +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #endif /* |