Commit e94d2cd9 authored by wdenk's avatar wdenk

* 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)
parent c3f4d17e
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
Changes since U-Boot 1.1.1: 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 * Add "cls" function to MPC823 LCD driver so we can reinitialize the
display even after showing a bitmap display even after showing a bitmap
......
...@@ -895,7 +895,7 @@ The following options need to be configured: ...@@ -895,7 +895,7 @@ The following options need to be configured:
If this option is set, the environment is checked for If this option is set, the environment is checked for
a variable "splashimage". If found, the usual display a variable "splashimage". If found, the usual display
of logo, copyright and system information on the LCD 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 specified in "splashimage" is loaded instead. The
console is redirected to the "nulldev", too. This console is redirected to the "nulldev", too. This
allows for a "silent" boot where a splash screen is allows for a "silent" boot where a splash screen is
......
...@@ -1333,9 +1333,11 @@ static void *lcd_logo (void) ...@@ -1333,9 +1333,11 @@ static void *lcd_logo (void)
#ifdef CONFIG_SPLASH_SCREEN #ifdef CONFIG_SPLASH_SCREEN
char *s; char *s;
ulong addr; 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); addr = simple_strtoul(s, NULL, 16);
do_splash = 0;
if (lcd_display_bitmap (addr, 0, 0) == 0) { if (lcd_display_bitmap (addr, 0, 0) == 0) {
return ((void *)lcd_base); return ((void *)lcd_base);
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#if ((CONFIG_COMMANDS & CFG_CMD_NET) && (CONFIG_COMMANDS & CFG_CMD_NFS)) #if ((CONFIG_COMMANDS & CFG_CMD_NET) && (CONFIG_COMMANDS & CFG_CMD_NFS))
#define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ #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 int fs_mounted = 0;
static unsigned long rpc_id = 0; static unsigned long rpc_id = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment