From b3cecec441015ce786e2f8258d5fe8a5bd7a116b Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 5 Jul 2007 18:01:22 +0200
Subject: [PATCH] svn_rev_092

generic/remove_autoload.diff
---
 README               |  5 -----
 common/environment.c |  3 ---
 net/bootp.c          | 43 +++----------------------------------------
 net/rarp.c           | 17 +----------------
 4 files changed, 4 insertions(+), 64 deletions(-)

diff --git a/README b/README
index 14a4ef85d..9690a4482 100644
--- a/README
+++ b/README
@@ -2558,11 +2558,6 @@ Some configuration options can be set using Environment Variables:
 
   bootfile	- Name of the image to load with TFTP
 
-  autoload	- if set to "no" (any string beginning with 'n'),
-		  "bootp" will just load perform a lookup of the
-		  configuration from the BOOTP server, but not try to
-		  load any image using TFTP
-
   autostart	- if set to "yes", an image loaded using the "bootp",
 		  "rarpboot", "tftpboot" or "diskboot" commands will
 		  be automatically started (by internally calling
diff --git a/common/environment.c b/common/environment.c
index 1d425a730..856e92c4e 100644
--- a/common/environment.c
+++ b/common/environment.c
@@ -150,9 +150,6 @@ env_t environment __PPCENV__ = {
 #ifdef	CONFIG_SERVERIP
 	"serverip="	MK_STR(CONFIG_SERVERIP)		"\0"
 #endif
-#ifdef	CFG_AUTOLOAD
-	"autoload="	CFG_AUTOLOAD			"\0"
-#endif
 #ifdef	CONFIG_ROOTPATH
 	"rootpath="	MK_STR(CONFIG_ROOTPATH)		"\0"
 #endif
diff --git a/net/bootp.c b/net/bootp.c
index cded61ce1..baded4d1c 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -318,26 +318,8 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
 
 	debug ("Got good BOOTP\n");
 
-	if ((s = getenv("autoload")) != NULL) {
-		if (*s == 'n') {
-			/*
-			 * Just use BOOTP to configure system;
-			 * Do not use TFTP to load the bootfile.
-			 */
-			NetState = NETLOOP_SUCCESS;
-			return;
-#if (CONFIG_COMMANDS & CFG_CMD_NFS)
-		} else if (strcmp(s, "NFS") == 0) {
-			/*
-			 * Use NFS to load the bootfile.
-			 */
-			NfsStart();
-			return;
-#endif
-		}
-	}
-
-	TftpStart();
+	NetState = NETLOOP_SUCCESS;
+	return;
 }
 #endif	/* !CFG_CMD_DHCP */
 
@@ -925,26 +907,7 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
 			print_IPaddr(NetOurIP);
 			putc ('\n');
 
-			/* Obey the 'autoload' setting */
-			if ((s = getenv("autoload")) != NULL) {
-				if (*s == 'n') {
-					/*
-					 * Just use BOOTP to configure system;
-					 * Do not use TFTP to load the bootfile.
-					 */
-					NetState = NETLOOP_SUCCESS;
-					return;
-#if (CONFIG_COMMANDS & CFG_CMD_NFS)
-				} else if (strcmp(s, "NFS") == 0) {
-					/*
-					 * Use NFS to load the bootfile.
-					 */
-					NfsStart();
-					return;
-#endif
-				}
-			}
-			TftpStart();
+			NetState = NETLOOP_SUCCESS;
 			return;
 		}
 		break;
diff --git a/net/rarp.c b/net/rarp.c
index 1ba60e803..33d2f6548 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -51,22 +51,7 @@ RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
 #ifdef	DEBUG
 	puts ("Got good RARP\n");
 #endif
-	if ((s = getenv("autoload")) != NULL) {
-		if (*s == 'n') {
-			/*
-			 * Just use RARP to configure system;
-			 * Do not use TFTP/NFS to to load the bootfile.
-			 */
-			NetState = NETLOOP_SUCCESS;
-			return;
-#if (CONFIG_COMMANDS & CFG_CMD_NFS)
-		} else if ((s != NULL) && !strcmp(s, "NFS")) {
-			NfsStart();
-			return;
-#endif
-		}
-	}
-	TftpStart ();
+	NetState = NETLOOP_SUCCESS;
 }