Use the new helper func to clean up duplicate logic handling of the
autostart env var.
Signed-off-by: Mike Frysinger <vap...@gentoo.org>
---
common/cmd_fdc.c | 3 +--
common/cmd_fdos.c | 2 +-
common/cmd_ide.c | 2 +-
common/cmd_nand.c | 4 ++--
common/cmd_net.c | 2 +-
common/cmd_scsi.c | 2 +-
common/cmd_usb.c | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index 831a07f..1655bdc 100644
--- 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];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index a8822d9..5bb5c64 100644
--- 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];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index ea0f4a7..f684e78 100644
--- 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];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 634d036..f79bd6d 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 *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];
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 44d17db..3320104 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -213,7 +213,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 6b937f9..0a3dd07 100644
--- 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];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 226ea0d..a7cffa5 100644
--- 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];
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
--
1.7.3.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
