summaryrefslogtreecommitdiff
path: root/common/cmd_nand.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-01-11 20:56:34 +0100
committerWolfgang Denk <wd@denx.de>2011-01-11 20:56:34 +0100
commit3e5ab1af245da25633954c5b51c85cc8da0a5036 (patch)
tree41efddcb4aa772f915c2f695c1f0537d28495d3c /common/cmd_nand.c
parent0e7790d450000c1a2cda40458adb28707eaa5041 (diff)
downloadu-boot-imx-3e5ab1af245da25633954c5b51c85cc8da0a5036.zip
u-boot-imx-3e5ab1af245da25633954c5b51c85cc8da0a5036.tar.gz
u-boot-imx-3e5ab1af245da25633954c5b51c85cc8da0a5036.tar.bz2
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_nand.c')
-rw-r--r--common/cmd_nand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index c547a68..6783645 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -711,7 +711,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
ulong offset, ulong addr, char *cmd)
{
int r;
- char *s;
+ char *ep, *s;
size_t cnt;
image_header_t *hdr;
#if defined(CONFIG_FIT)
@@ -787,7 +787,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
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] = cmd;