sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

svn_rev_092 

generic/remove_autoload.diff
This commit is contained in:
Sascha Hauer 2007-07-05 18:01:22 +02:00 committed by Sascha Hauer
parent 45a0fa5ac5
commit b3cecec441
4 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -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

3
common/environment.c
View File

@ -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

43
net/bootp.c
View File

@ -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;

17
net/rarp.c
View File

@ -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;
}