diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-12-22 21:16:17 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-22 21:16:17 +0100 | 
| commit | cdc51c294ad33879c4e57edf4c9d2155381b1d59 (patch) | |
| tree | fc1c3f2c23a2507e91358a6a6dfa881965bf603f /common/cmd_net.c | |
| parent | 250ef029844be2cb98635f265359396866d1749f (diff) | |
| parent | b8339e2b9f32663411dba0f48e25b23f542d53bc (diff) | |
| download | olio-uboot-2014.01-cdc51c294ad33879c4e57edf4c9d2155381b1d59.tar.xz olio-uboot-2014.01-cdc51c294ad33879c4e57edf4c9d2155381b1d59.zip | |
Merge branch 'next' of ../next
Diffstat (limited to 'common/cmd_net.c')
| -rw-r--r-- | common/cmd_net.c | 4 | 
1 files changed, 1 insertions, 3 deletions
| diff --git a/common/cmd_net.c b/common/cmd_net.c index 44d17db19..973fa2127 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -28,8 +28,6 @@  #include <command.h>  #include <net.h> -extern int do_bootm (cmd_tbl_t *, int, int, char * const []); -  static int netboot_common (proto_t, cmd_tbl_t *, int , char * const []);  int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -213,7 +211,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[])  	flush_cache(load_addr, size);  	/* Loading ok, check if we should attempt an auto-start */ -	if (((s = getenv("autostart")) != NULL) && (strcmp(s,"yes") == 0)) { +	if (getenv_yesno("autostart")) {  		char *local_args[2];  		local_args[0] = argv[0];  		local_args[1] = NULL; |