diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:22 +0200 |
| commit | b3cecec441015ce786e2f8258d5fe8a5bd7a116b (patch) | |
| tree | f3280ab5a0d60e8ce9b529ded0e71b6fbd0373c4 /net | |
| parent | 45a0fa5ac5cabe2eba077cc31ffaf6eedc23a961 (diff) | |
| download | barebox-b3cecec441015ce786e2f8258d5fe8a5bd7a116b.tar.gz barebox-b3cecec441015ce786e2f8258d5fe8a5bd7a116b.tar.xz | |
svn_rev_092
generic/remove_autoload.diff
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 43 | ||||
| -rw-r--r-- | net/rarp.c | 17 |
2 files changed, 4 insertions, 56 deletions
diff --git a/net/bootp.c b/net/bootp.c index cded61ce1d..baded4d1c2 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 1ba60e803c..33d2f65486 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; } |