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>

diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index d373480f7911dbccc6ca26008425295149570f18..cdb050c255980577d460b4e2da15c5b30e804a2f 100644 (file)
--- 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];

diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index 238abdde461762dc1acf6997143ddbf4b3e0e1a1..2af4ca0efeb788707b6f40583026767a8f05cf50 100644 (file)
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -99,7 +99,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
           size, load_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];
        local_args[1] = NULL;

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index f6278812a051423cb1ea43f7fd097672a54b6b50..df7bdf56ec4d6f3491ecf979863e905d12872fcc 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -496,7 +496,7 @@ int do_diskboot (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];

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index c547a683f40e1f0b88adf556814a87572b609245..6783645356fefd35c6a21a7418be5454e806a058 100644 (file)
--- 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;

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 00e0ea8dd345da52d68338b3e3e821daeb359062..8c6f5c8c3dd29d57c65bb896581708c44746d415 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -211,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 (getenv_yesno("autostart")) {
+       if (((s = getenv("autostart")) != NULL) && (strcmp(s,"yes") == 0)) {
                char *local_args[2];
                local_args[0] = argv[0];
                local_args[1] = NULL;

diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 63a46ded89354ea60dae47d52a31c89bb5a67d45..be4fe741c3f6ea0bfa390f6aab1f67bf1f96a293 100644 (file)
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -327,7 +327,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        flush_cache (addr, (cnt+1)*info.blksz);
 
        /* 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];
                local_args[1] = NULL;

diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 843919822cadb66c794f62924236dedbd7bd6bab..b04a8df764db9bde494ed42bbfd7cd279eeb856b 100644 (file)
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -488,7 +488,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        flush_cache(addr, (cnt+1)*info.blksz);
 
        /* 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];
                local_args[1] = NULL;