From: wdenk <wdenk>
Date: Wed, 30 Jun 2004 22:59:18 +0000 (+0000)
Subject: * Fix "cls" command when used with splash screen
X-Git-Tag: LABEL_2006_03_12_0025~535
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e94d2cd9d1dc0f58b18e7c31fc9345129b1a44fb;p=u-boot

* 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 aaaf9a454f..aacc1ec9a6 100644
--- 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 fcdcce66ed..faa5ec4870 100644
--- 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 794ca02509..882a146652 100644
--- 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 300c08fa96..281d0f5722 100644
--- 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;