Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 17:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

boot cmds: convert to getenv_yesno() with autostart

Browse source 
Use the new helper func to clean up duplicate logic handling of the
autostart env var.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-10-20 07:17:55 -04:00 committed by Wolfgang Denk
parent 543f0a3819
commit 5a442c0add
7 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/cmd_fdc.c
View file

@ -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 */ image_header_t *hdr; /* used for fdc boot */
unsigned char boot_drive; unsigned char boot_drive;
int i,nrofblk; int i,nrofblk;
char *ep;
int rcode = 0; int rcode = 0;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
const void *fit_hdr = NULL; 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; load_addr = addr;
/* Check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = argv[0]; local_args[0] = argv[0];

2
common/cmd_fdos.c
View file

@ -99,7 +99,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
size, load_addr); size, load_addr);
/* Check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = argv[0]; local_args[0] = argv[0];
local_args[1] = NULL; local_args[1] = NULL;

2
common/cmd_ide.c
View file

@ -496,7 +496,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
load_addr = addr; load_addr = addr;
/* Check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = argv[0]; local_args[0] = argv[0];

4
common/cmd_nand.c
View file

@ -711,7 +711,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
ulong offset, ulong addr, char *cmd) ulong offset, ulong addr, char *cmd)
{ {
int r; int r;
char *ep, *s; char *s;
size_t cnt; size_t cnt;
image_header_t *hdr; image_header_t *hdr;
#if defined(CONFIG_FIT) #if defined(CONFIG_FIT)
@ -787,7 +787,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
load_addr = addr; load_addr = addr;
/* Check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = cmd; local_args[0] = cmd;

2
common/cmd_net.c
View file

@ -211,7 +211,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[])
flush_cache(load_addr, size); flush_cache(load_addr, size);
/* Loading ok, check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = argv[0]; local_args[0] = argv[0];
local_args[1] = NULL; local_args[1] = NULL;

2
common/cmd_scsi.c
View file

@ -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); flush_cache (addr, (cnt+1)*info.blksz);
/* Check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = argv[0]; local_args[0] = argv[0];
local_args[1] = NULL; local_args[1] = NULL;

2
common/cmd_usb.c
View file

@ -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); flush_cache(addr, (cnt+1)*info.blksz);
/* Check if we should attempt an auto-start */ /* 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]; char *local_args[2];
local_args[0] = argv[0]; local_args[0] = argv[0];
local_args[1] = NULL; local_args[1] = NULL;