Merge branch 'next' of git://git.denx.de/u-boot into next

diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index cdb050c..d373480 100644 (file)
--- a/common/cmd_fdc.c
+++ b/common/cmd_fdc.c
@@ -721,7 +721,6 @@ 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;
@@ -824,7 +823,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 (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+       if (getenv_yesno("autostart")) {
                char *local_args[2];
 
                local_args[0] = argv[0];

diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index 2af4ca0..238abdd 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 (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+    if (getenv_yesno("autostart")) {
        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 df7bdf5..f627881 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 (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+       if (getenv_yesno("autostart")) {
                char *local_args[2];
 
                local_args[0] = argv[0];

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 6783645..c547a68 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 *ep, *s;
+       char *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 (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
+       if (getenv_yesno("autostart")) {
                char *local_args[2];
 
                local_args[0] = cmd;

diff --git a/common/cmd_net.c b/common/cmd_net.c
index c657b03..973fa21 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 (((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;

diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index be4fe74..63a46de 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 (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+       if (getenv_yesno("autostart")) {
                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 b04a8df..8439198 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 (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
+       if (getenv_yesno("autostart")) {
                char *local_args[2];
                local_args[0] = argv[0];
                local_args[1] = NULL;