* Fix "cls" command when used with splash screen

* Increase NFS download timeout (now 1 min - 10 sec is to short for a
  slow download of a big image)
This commit is contained in:
wdenk 2004-06-30 22:59:18 +00:00
parent c3f4d17e05
commit e94d2cd9d1
4 changed files with 10 additions and 3 deletions

View file

@ -2,6 +2,11 @@
Changes since U-Boot 1.1.1:
======================================================================
* Fix "cls" command when used with splash screen
* Increase NFS download timeout (now 1 min - 10 sec is to short for a
slow download of a big image)
* Add "cls" function to MPC823 LCD driver so we can reinitialize the
display even after showing a bitmap

2
README
View file

@ -895,7 +895,7 @@ The following options need to be configured:
If this option is set, the environment is checked for
a variable "splashimage". If found, the usual display
of logo, copyright and system information on the LCD
is supressed and the BMP image at the address
is suppressed and the BMP image at the address
specified in "splashimage" is loaded instead. The
console is redirected to the "nulldev", too. This
allows for a "silent" boot where a splash screen is

View file

@ -1333,9 +1333,11 @@ static void *lcd_logo (void)
#ifdef CONFIG_SPLASH_SCREEN
char *s;
ulong addr;
static int do_splash = 1;
if ((s = getenv("splashimage")) != NULL) {
if (do_splash && (s = getenv("splashimage")) != NULL) {
addr = simple_strtoul(s, NULL, 16);
do_splash = 0;
if (lcd_display_bitmap (addr, 0, 0) == 0) {
return ((void *)lcd_base);

View file

@ -34,7 +34,7 @@
#if ((CONFIG_COMMANDS & CFG_CMD_NET) && (CONFIG_COMMANDS & CFG_CMD_NFS))
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */
#define NFS_TIMEOUT 10
#define NFS_TIMEOUT 60
static int fs_mounted = 0;
static unsigned long rpc_id = 0;