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>
This commit is contained in:
Bastian Ruppert 2012-09-13 22:29:00 +00:00 committed by Tom Rini
parent bdb04abe42
commit 39e133d196
2 changed files with 11 additions and 2 deletions

View file

@ -254,6 +254,15 @@ int board_early_init_f(void)
return 0; return 0;
} }
/*
* Do not overwrite the console
* Use always serial for U-Boot console
*/
int overwrite_console(void)
{
return 1;
}
int board_init(void) int board_init(void)
{ {
/* arch number of the board */ /* arch number of the board */
@ -281,8 +290,6 @@ int board_late_init(void)
/* Set HALTEN to high */ /* Set HALTEN to high */
gpio_direction_output(134, 1); gpio_direction_output(134, 1);
setenv("stdout", "serial");
/* Set fixed contrast settings for LCD via I2C potentiometer */ /* Set fixed contrast settings for LCD via I2C potentiometer */
buf[0] = 0x00; buf[0] = 0x00;
buf[1] = 0xd7; buf[1] = 0xd7;

View file

@ -124,6 +124,8 @@
#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_LOGO
#define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_VIDEO_BMP_RLE8
#define CONFIG_CMD_BMP #define CONFIG_CMD_BMP
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
#endif #endif
/* /*