* 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)

diff --git a/CHANGELOG b/CHANGELOG
index aaaf9a454f7c1b49f9951fde0283efcf0f15e969..aacc1ec9a6a2324fd464c3db011ffed561152c40 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 

diff --git a/README b/README
index fcdcce66ed0720b6e35e6658507353bfe2bcd3df..faa5ec4870bec434cb7b0e6018aa4eaa26b6ce42 100644 (file)
--- a/README
+++ b/README
@@ -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

diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c
index 794ca025096c9c171e52a2729a5ee13c5a81691b..882a146652a0394d0349cde0922151f53ebe2f78 100644 (file)
--- a/cpu/mpc8xx/lcd.c
+++ b/cpu/mpc8xx/lcd.c
@@ -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);

diff --git a/net/nfs.c b/net/nfs.c
index 300c08fa9678e7424ecce80054acc4cdb67059d9..281d0f5722c7dada621318076037c4d9da3c30c7 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -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;