diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-11 20:56:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-11 20:56:34 +0100 |
| commit | 3e5ab1af245da25633954c5b51c85cc8da0a5036 (patch) | |
| tree | 41efddcb4aa772f915c2f695c1f0537d28495d3c /common/cmd_fdc.c | |
| parent | 0e7790d450000c1a2cda40458adb28707eaa5041 (diff) | |
| download | talos-obmc-uboot-3e5ab1af245da25633954c5b51c85cc8da0a5036.tar.gz talos-obmc-uboot-3e5ab1af245da25633954c5b51c85cc8da0a5036.zip | |
Revert "boot cmds: convert to getenv_yesno() with autostart"
This reverts commit 5a442c0addc69d0c4b58e98e5aec1cf07576debb.
This commit changed the behaviour of getenv_yesno() (both the default
behaviour and the documented behaviour for abbreviated arguments)
which resulted in problems in several areas.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common/cmd_fdc.c')
| -rw-r--r-- | common/cmd_fdc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index d373480f79..cdb050c255 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -721,6 +721,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) image_header_t *hdr; /* used for fdc boot */ unsigned char boot_drive; int i,nrofblk; + char *ep; int rcode = 0; #if defined(CONFIG_FIT) const void *fit_hdr = NULL; @@ -823,7 +824,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) load_addr = addr; /* Check if we should attempt an auto-start */ - if (getenv_yesno("autostart")) { + if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { char *local_args[2]; local_args[0] = argv[0]; |
