Change all files in common/ to use CMD_RET_USAGE instead of calling
cmd_usage() directly. I'm not completely sure about this patch since
the code since impact is small (100 byte or so on ARM) and it might
need splitting into smaller patches. But for now here it is.
Signed-off-by: Simon Glass <sjg@chromium.org>
57 files changed:
len = dis_last_len;
if (argc < 2)
len = dis_last_len;
if (argc < 2)
- return cmd_usage(cmdtp);
if ((flag & CMD_FLAG_REPEAT) == 0) {
/* New command */
if ((flag & CMD_FLAG_REPEAT) == 0) {
/* New command */
int rcode = 0;
if (argc < 2)
int rcode = 0;
if (argc < 2)
- return cmd_usage(cmdtp);
printf ("\nEnter '.' when done\n");
mem_addr = simple_strtoul (argv[1], NULL, 16);
printf ("\nEnter '.' when done\n");
mem_addr = simple_strtoul (argv[1], NULL, 16);
addr = simple_strtoul(argv[1], NULL, 16);
break;
default:
addr = simple_strtoul(argv[1], NULL, 16);
break;
default:
- return cmd_usage(cmdtp);
}
return (bmp_info(addr));
}
return (bmp_info(addr));
y = simple_strtoul(argv[3], NULL, 10);
break;
default:
y = simple_strtoul(argv[3], NULL, 10);
break;
default:
- return cmd_usage(cmdtp);
}
return (bmp_display(addr, x, y));
}
return (bmp_display(addr, x, y));
if (c)
return c->cmd(cmdtp, flag, argc, argv);
else
if (c)
return c->cmd(cmdtp, flag, argc, argv);
else
- return cmd_usage(cmdtp);
int rcode = 0;
if (argc < 2)
int rcode = 0;
if (argc < 2)
- return cmd_usage(cmdtp);
addr = simple_strtoul(argv[1], NULL, 16);
addr = simple_strtoul(argv[1], NULL, 16);
}
} else {
/* Unrecognized command */
}
} else {
/* Unrecognized command */
- return cmd_usage(cmdtp);
}
if (images.state >= state) {
printf("Trying to execute a command out of order\n");
}
if (images.state >= state) {
printf("Trying to execute a command out of order\n");
- return cmd_usage(cmdtp);
icache_status() ? "ON" : "OFF");
return 0;
default:
icache_status() ? "ON" : "OFF");
return 0;
default:
- return cmd_usage(cmdtp);
dcache_status() ? "ON" : "OFF");
return 0;
default:
dcache_status() ? "ON" : "OFF");
return 0;
default:
- return cmd_usage(cmdtp);
AT91F_GetMuxStatus () ? "MMC" : "SPI");
return 0;
default:
AT91F_GetMuxStatus () ? "MMC" : "SPI");
return 0;
default:
- return cmd_usage(cmdtp);
- cmd_usage(cmdtp);
- rcode = 1;
}
/* switch back to original I2C bus */
}
/* switch back to original I2C bus */
/* Validate arguments */
if (argc < 2)
/* Validate arguments */
if (argc < 2)
- return cmd_usage(cmdtp);
/* Get a DCR */
dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16);
/* Get a DCR */
dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16);
/* Validate arguments */
if (argc < 2)
/* Validate arguments */
if (argc < 2)
- return cmd_usage(cmdtp);
/* Set a DCR */
dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16);
/* Set a DCR */
dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16);
/* Validate arguments */
if (argc < 3)
/* Validate arguments */
if (argc < 3)
- return cmd_usage(cmdtp);
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
/* Validate arguments */
if (argc < 4)
/* Validate arguments */
if (argc < 4)
- return cmd_usage(cmdtp);
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
/* Find out whether ther is '.' (dot) symbol in the first parameter. */
strncpy (buf, argv[1], sizeof(buf)-1);
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
int part_length;
if (argc < 3)
int part_length;
if (argc < 3)
- return cmd_usage(cmdtp);
dev = (int)simple_strtoul (argv[2], &ep, 16);
dev_desc = get_dev(argv[1],dev);
dev = (int)simple_strtoul (argv[2], &ep, 16);
dev_desc = get_dev(argv[1],dev);
- return cmd_usage(cmdtp);
boot_drive=simple_strtoul(argv[2], NULL, 10);
break;
default:
boot_drive=simple_strtoul(argv[2], NULL, 10);
break;
default:
- return cmd_usage(cmdtp);
}
/* setup FDC and scan for drives */
if(fdc_setup(boot_drive,pCMD,pFG)==FALSE) {
}
/* setup FDC and scan for drives */
if(fdc_setup(boot_drive,pCMD,pFG)==FALSE) {
name = argv [2];
break;
default:
name = argv [2];
break;
default:
- return cmd_usage(cmdtp);
}
/* Init physical layer */
}
/* Init physical layer */
int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
{
if (argc < 2)
int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
{
if (argc < 2)
- return cmd_usage(cmdtp);
/*
* Set the address of the fdt
/*
* Set the address of the fdt
- return cmd_usage(cmdtp);
/*
* Set the address and length of the fdt.
/*
* Set the address and length of the fdt.
* Parameters: Node path, new node to be appended to the path.
*/
if (argc < 4)
* Parameters: Node path, new node to be appended to the path.
*/
if (argc < 4)
- return cmd_usage(cmdtp);
pathp = argv[2];
nodep = argv[3];
pathp = argv[2];
nodep = argv[3];
* Parameters: Node path, property, optional value.
*/
if (argc < 4)
* Parameters: Node path, property, optional value.
*/
if (argc < 4)
- return cmd_usage(cmdtp);
pathp = argv[2];
prop = argv[3];
pathp = argv[2];
prop = argv[3];
}
} else {
/* Unrecognized command */
}
} else {
/* Unrecognized command */
- return cmd_usage(cmdtp);
}
}
#ifdef CONFIG_OF_BOARD_SETUP
}
}
#ifdef CONFIG_OF_BOARD_SETUP
unsigned long initrd_start = 0, initrd_end = 0;
if ((argc != 2) && (argc != 4))
unsigned long initrd_start = 0, initrd_end = 0;
if ((argc != 2) && (argc != 4))
- return cmd_usage(cmdtp);
if (argc == 4) {
initrd_start = simple_strtoul(argv[2], NULL, 16);
if (argc == 4) {
initrd_start = simple_strtoul(argv[2], NULL, 16);
}
else {
/* Unrecognized command */
}
else {
/* Unrecognized command */
- return cmd_usage(cmdtp);
ulong addr = 0UL;
if (argc > 2)
ulong addr = 0UL;
if (argc > 2)
- return cmd_usage(cmdtp);
if (argc == 2)
addr = simple_strtoul(argv[1], NULL, 16);
if (argc == 2)
addr = simple_strtoul(argv[1], NULL, 16);
int rcode = 0;
if (argc < 2)
int rcode = 0;
if (argc < 2)
- return cmd_usage(cmdtp);
if (strcmp(argv[1], "all") == 0) {
for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
if (strcmp(argv[1], "all") == 0) {
for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) {
- return cmd_usage(cmdtp);
if (strcmp(argv[1], "bank") == 0) {
bank = simple_strtoul(argv[2], NULL, 16);
if (strcmp(argv[1], "bank") == 0) {
bank = simple_strtoul(argv[2], NULL, 16);
}
if (addr_first >= addr_last)
}
if (addr_first >= addr_last)
- return cmd_usage(cmdtp);
rcode = flash_sect_erase(addr_first, addr_last);
return rcode;
rcode = flash_sect_erase(addr_first, addr_last);
return rcode;
- return cmd_usage(cmdtp);
#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
if (strcmp(argv[1], "off") == 0)
#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH)
if (strcmp(argv[1], "off") == 0)
else if (strcmp(argv[1], "on") == 0)
p = 1;
else
else if (strcmp(argv[1], "on") == 0)
p = 1;
else
- return cmd_usage(cmdtp);
#endif
#ifdef CONFIG_HAS_DATAFLASH
#endif
#ifdef CONFIG_HAS_DATAFLASH
- return cmd_usage(cmdtp);
if (strcmp(argv[2], "bank") == 0) {
bank = simple_strtoul(argv[3], NULL, 16);
if (strcmp(argv[2], "bank") == 0) {
bank = simple_strtoul(argv[3], NULL, 16);
}
if (addr_first >= addr_last)
}
if (addr_first >= addr_last)
- return cmd_usage(cmdtp);
rcode = flash_sect_protect (p, addr_first, addr_last);
#endif /* CONFIG_SYS_NO_FLASH */
rcode = flash_sect_protect (p, addr_first, addr_last);
#endif /* CONFIG_SYS_NO_FLASH */
switch (op) {
case FPGA_NONE:
switch (op) {
case FPGA_NONE:
- return cmd_usage(cmdtp);
case FPGA_INFO:
rc = fpga_info (dev);
case FPGA_INFO:
rc = fpga_info (dev);
default:
printf ("Unknown operation\n");
default:
printf ("Unknown operation\n");
- return cmd_usage(cmdtp);
if (argc != 3)
show_usage:
if (argc != 3)
show_usage:
- return cmd_usage(cmdtp);
str_cmd = argv[1];
str_gpio = argv[2];
str_cmd = argv[1];
str_gpio = argv[2];
u_char *memaddr;
if (argc != 5)
u_char *memaddr;
if (argc != 5)
- return cmd_usage(cmdtp);
devaddr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
devaddr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
- return cmd_usage(cmdtp);
/*
* Length is the number of objects, not number of bytes.
/*
* Length is the number of objects, not number of bytes.
length = i2c_dp_last_length;
if (argc < 3)
length = i2c_dp_last_length;
if (argc < 3)
- return cmd_usage(cmdtp);
if ((flag & CMD_FLAG_REPEAT) == 0) {
/*
if ((flag & CMD_FLAG_REPEAT) == 0) {
/*
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
- return cmd_usage(cmdtp);
/*
* If another parameter, it is the length to display.
/*
* If another parameter, it is the length to display.
int count;
if ((argc < 4) || (argc > 5))
int count;
if ((argc < 4) || (argc > 5))
- return cmd_usage(cmdtp);
/*
* Chip is always specified.
/*
* Chip is always specified.
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
- return cmd_usage(cmdtp);
/*
* Value to write is always specified.
/*
* Value to write is always specified.
- return cmd_usage(cmdtp);
/*
* Chip is always specified.
/*
* Chip is always specified.
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
- return cmd_usage(cmdtp);
/*
* Count is always specified
/*
* Count is always specified
int nbytes;
if (argc != 3)
int nbytes;
if (argc != 3)
- return cmd_usage(cmdtp);
#ifdef CONFIG_BOOT_RETRY_TIME
reset_cmd_timeout(); /* got a good command to get here */
#ifdef CONFIG_BOOT_RETRY_TIME
reset_cmd_timeout(); /* got a good command to get here */
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
/*
* Chip is always specified.
/*
* Chip is always specified.
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
addr = simple_strtoul(argv[2], NULL, 16);
alen = get_alen(argv[2]);
if (alen > 3)
- return cmd_usage(cmdtp);
/*
* Length is the number of objects, not number of bytes.
/*
* Length is the number of objects, not number of bytes.
- return cmd_usage(cmdtp);
/*
* Chip is always specified.
/*
* Chip is always specified.
cmd_tbl_t *c;
if (argc < 2)
cmd_tbl_t *c;
if (argc < 2)
- return cmd_usage(cmdtp);
/* Strip off leading 'i2c' command argument */
argc--;
/* Strip off leading 'i2c' command argument */
argc--;
c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub));
if (c)
c = find_cmd_tbl(argv[0], &cmd_i2c_sub[0], ARRAY_SIZE(cmd_i2c_sub));
if (c)
- return c->cmd(cmdtp, flag, argc, argv);
+ return c->cmd(cmdtp, flag, argc, argv);
- return cmd_usage(cmdtp);
}
/***************************************************/
}
/***************************************************/
switch (argc) {
case 0:
case 1:
switch (argc) {
case 0:
case 1:
- return cmd_usage(cmdtp);
case 2:
if (strncmp(argv[1], "res", 3) == 0) {
puts("\nReset IDE"
case 2:
if (strncmp(argv[1], "res", 3) == 0) {
puts("\nReset IDE"
- return cmd_usage(cmdtp);
case 3:
if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int) simple_strtoul(argv[2], NULL, 10);
case 3:
if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int) simple_strtoul(argv[2], NULL, 10);
- return cmd_usage(cmdtp);
default:
/* at least 4 args */
default:
/* at least 4 args */
- return cmd_usage(cmdtp);
break;
default:
show_boot_progress(-42);
break;
default:
show_boot_progress(-42);
- return cmd_usage(cmdtp);
}
show_boot_progress(42);
}
show_boot_progress(42);
- return cmd_usage(cmdtp);
/* on */
if (strncmp(argv[1], "on", 2) == 0)
/* on */
if (strncmp(argv[1], "on", 2) == 0)
/* Validate arguments */
if ((argc != 4))
/* Validate arguments */
if ((argc != 4))
- return cmd_usage(cmdtp);
/* Check for a data width specification.
* Defaults to long (4) if no specification.
/* Check for a data width specification.
* Defaults to long (4) if no specification.
/* Validate arguments */
if ((argc != 3)) {
/* Validate arguments */
if ((argc != 3)) {
- return cmd_usage(cmdtp);
}
cmd = get_led_cmd(argv[2]);
if (cmd < 0) {
}
cmd = get_led_cmd(argv[2]);
if (cmd < 0) {
- return cmd_usage(cmdtp);
}
for (i = 0; led_commands[i].string; i++) {
}
for (i = 0; led_commands[i].string; i++) {
/* If we ran out of matches, print Usage */
if (!match) {
/* If we ran out of matches, print Usage */
if (!match) {
- return cmd_usage(cmdtp);
if (strcmp(argv[1], "on") == 0)
hwflow_onoff(1);
else
if (strcmp(argv[1], "on") == 0)
hwflow_onoff(1);
else
- return cmd_usage(cmdtp);
}
printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off");
return 0;
}
printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off");
return 0;
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
u8 output[16];
if (argc < 3)
u8 output[16];
if (argc < 3)
- return cmd_usage(cmdtp);
addr = simple_strtoul(argv[1], NULL, 16);
len = simple_strtoul(argv[2], NULL, 16);
addr = simple_strtoul(argv[1], NULL, 16);
len = simple_strtoul(argv[2], NULL, 16);
struct mii_dev *bus;
if (argc < 2)
struct mii_dev *bus;
if (argc < 2)
- return cmd_usage(cmdtp);
/*
* We use the last specified parameters, unless new ones are
/*
* We use the last specified parameters, unless new ones are
length = dp_last_length;
if (argc < 2)
length = dp_last_length;
if (argc < 2)
- return cmd_usage(cmdtp);
if ((flag & CMD_FLAG_REPEAT) == 0) {
/* New command specified. Check for a size specification.
if ((flag & CMD_FLAG_REPEAT) == 0) {
/* New command specified. Check for a size specification.
int size;
if ((argc < 3) || (argc > 4))
int size;
if ((argc < 3) || (argc > 4))
- return cmd_usage(cmdtp);
/* Check for size specification.
*/
/* Check for size specification.
*/
ulong count;
if (argc < 4)
ulong count;
if (argc < 4)
- return cmd_usage(cmdtp);
count = simple_strtoul(argv[3], NULL, 10);
count = simple_strtoul(argv[3], NULL, 10);
ulong count;
if (argc < 4)
ulong count;
if (argc < 4)
- return cmd_usage(cmdtp);
count = simple_strtoul(argv[3], NULL, 10);
count = simple_strtoul(argv[3], NULL, 10);
int rcode = 0;
if (argc != 4)
int rcode = 0;
if (argc != 4)
- return cmd_usage(cmdtp);
/* Check for size specification.
*/
/* Check for size specification.
*/
- return cmd_usage(cmdtp);
/* Check for size specification.
*/
/* Check for size specification.
*/
volatile u_char *cp;
if (argc < 3)
volatile u_char *cp;
if (argc < 3)
- return cmd_usage(cmdtp);
/* Check for a size spefication.
* Defaults to long if no or incorrect specification.
/* Check for a size spefication.
* Defaults to long if no or incorrect specification.
volatile u_char *cp;
if (argc < 4)
volatile u_char *cp;
if (argc < 4)
- return cmd_usage(cmdtp);
/* Check for a size spefication.
* Defaults to long if no or incorrect specification.
/* Check for a size spefication.
* Defaults to long if no or incorrect specification.
int nbytes, size;
if (argc != 2)
int nbytes, size;
if (argc != 2)
- return cmd_usage(cmdtp);
#ifdef CONFIG_BOOT_RETRY_TIME
reset_cmd_timeout(); /* got a good command to get here */
#ifdef CONFIG_BOOT_RETRY_TIME
reset_cmd_timeout(); /* got a good command to get here */
ulong *ptr;
if (argc < 3)
ulong *ptr;
if (argc < 3)
- return cmd_usage(cmdtp);
addr = simple_strtoul (argv[1], NULL, 16);
addr += base_address;
addr = simple_strtoul (argv[1], NULL, 16);
addr += base_address;
- return cmd_usage(cmdtp);
unsigned int blocking;
if (argc < 2)
unsigned int blocking;
if (argc < 2)
- return cmd_usage(cmdtp);
fslnum = (unsigned int)simple_strtoul (argv[1], NULL, 16);
blocking = (unsigned int)simple_strtoul (argv[2], NULL, 16);
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
puts ("Bad number of FSL\n");
fslnum = (unsigned int)simple_strtoul (argv[1], NULL, 16);
blocking = (unsigned int)simple_strtoul (argv[2], NULL, 16);
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER) {
puts ("Bad number of FSL\n");
- return cmd_usage(cmdtp);
unsigned int blocking;
if (argc < 3)
unsigned int blocking;
if (argc < 3)
- return cmd_usage(cmdtp);
fslnum = (unsigned int)simple_strtoul (argv[1], NULL, 16);
num = (unsigned int)simple_strtoul (argv[2], NULL, 16);
blocking = (unsigned int)simple_strtoul (argv[3], NULL, 16);
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER)
fslnum = (unsigned int)simple_strtoul (argv[1], NULL, 16);
num = (unsigned int)simple_strtoul (argv[2], NULL, 16);
blocking = (unsigned int)simple_strtoul (argv[3], NULL, 16);
if (fslnum < 0 || fslnum >= XILINX_FSL_NUMBER)
- return cmd_usage(cmdtp);
switch (fslnum) {
#if (XILINX_FSL_NUMBER > 0)
switch (fslnum) {
#if (XILINX_FSL_NUMBER > 0)
unsigned int val = 0;
if (argc < 2)
unsigned int val = 0;
if (argc < 2)
- return cmd_usage(cmdtp);
reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
reg = (unsigned int)simple_strtoul (argv[1], NULL, 16);
val = (unsigned int)simple_strtoul (argv[2], NULL, 16);
return 1;
break;
default:
return 1;
break;
default:
- return cmd_usage(cmdtp);
const char *devname;
if (argc < 2)
const char *devname;
if (argc < 2)
- return cmd_usage(cmdtp);
#if defined(CONFIG_MII_INIT)
mii_init ();
#if defined(CONFIG_MII_INIT)
mii_init ();
else
miiphy_set_current_dev (argv[2]);
} else {
else
miiphy_set_current_dev (argv[2]);
} else {
- return cmd_usage(cmdtp);
ulong delay;
if (argc != 2)
ulong delay;
if (argc != 2)
- return cmd_usage(cmdtp);
delay = simple_strtoul(argv[1], NULL, 10) * CONFIG_SYS_HZ;
delay = simple_strtoul(argv[1], NULL, 10) * CONFIG_SYS_HZ;
- return cmd_usage(cmdtp);
if (strcmp(argv[1], "init") == 0) {
if (argc == 2) {
if (strcmp(argv[1], "init") == 0) {
if (argc == 2) {
} else if (argc == 3) {
dev = (int)simple_strtoul(argv[2], NULL, 10);
} else {
} else if (argc == 3) {
dev = (int)simple_strtoul(argv[2], NULL, 10);
} else {
- return cmd_usage(cmdtp);
}
if (mmc_legacy_init(dev) != 0) {
}
if (mmc_legacy_init(dev) != 0) {
#endif
curr_device = dev;
} else {
#endif
curr_device = dev;
} else {
- return cmd_usage(cmdtp);
}
printf("mmc%d is current device\n", curr_device);
} else {
}
printf("mmc%d is current device\n", curr_device);
} else {
- return cmd_usage(cmdtp);
enum mmc_state state;
if (argc < 2)
enum mmc_state state;
if (argc < 2)
- return cmd_usage(cmdtp);
if (curr_device < 0) {
if (get_mmc_num() > 0)
if (curr_device < 0) {
if (get_mmc_num() > 0)
- return cmd_usage(cmdtp);
mmc = find_mmc_device(dev);
if (!mmc) {
mmc = find_mmc_device(dev);
if (!mmc) {
return (n == cnt) ? 0 : 1;
}
return (n == cnt) ? 0 : 1;
}
- return cmd_usage(cmdtp);
- cmd_usage(cmdtp);
- return 1;
unsigned long cpuid;
if (argc < 3)
unsigned long cpuid;
if (argc < 3)
- return cmd_usage(cmdtp);
cpuid = simple_strtoul(argv[1], NULL, 10);
if (!is_core_valid(cpuid)) {
cpuid = simple_strtoul(argv[1], NULL, 10);
if (!is_core_valid(cpuid)) {
else if (strncmp(argv[2], "disable", 7) == 0)
return cpu_disable(cpuid);
else
else if (strncmp(argv[2], "disable", 7) == 0)
return cpu_disable(cpuid);
else
- return cmd_usage(cmdtp);
return 0;
}
/* 4 or greater, make sure its release */
if (strncmp(argv[2], "release", 7) != 0)
return 0;
}
/* 4 or greater, make sure its release */
if (strncmp(argv[2], "release", 7) != 0)
- return cmd_usage(cmdtp);
if (cpu_release(cpuid, argc - 3, argv + 3))
if (cpu_release(cpuid, argc - 3, argv + 3))
- return cmd_usage(cmdtp);
return spread_partitions();
#endif /* CONFIG_CMD_MTDPARTS_SPREAD */
return spread_partitions();
#endif /* CONFIG_CMD_MTDPARTS_SPREAD */
- return cmd_usage(cmdtp);
}
/***************************************************/
}
/***************************************************/
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
usage:
#endif
show_boot_progress(-53);
usage:
#endif
show_boot_progress(-53);
- return cmd_usage(cmdtp);
}
show_boot_progress(53);
}
show_boot_progress(53);
#endif
default:
show_boot_progress (-80);
#endif
default:
show_boot_progress (-80);
- return cmd_usage(cmdtp);
}
show_boot_progress (80);
}
show_boot_progress (80);
NetPingIP = string_to_ip(argv[1]);
if (NetPingIP == 0)
NetPingIP = string_to_ip(argv[1]);
if (NetPingIP == 0)
- return cmd_usage(cmdtp);
if (NetLoop(PING) < 0) {
printf("ping failed; host %s is not alive\n", argv[1]);
if (NetLoop(PING) < 0) {
printf("ping failed; host %s is not alive\n", argv[1]);
int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc == 1)
int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc == 1)
- return cmd_usage(cmdtp);
/*
* We should check for a valid hostname:
/*
* We should check for a valid hostname:
int rcode = 1, arg = 1, idx;
if (argc < 2)
int rcode = 1, arg = 1, idx;
if (argc < 2)
- return cmd_usage(cmdtp);
memset(matched, 0, env_htab.size / 8);
memset(matched, 0, env_htab.size / 8);
int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc < 2)
int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc < 2)
- return cmd_usage(cmdtp);
return _do_env_set(flag, argc, argv);
}
return _do_env_set(flag, argc, argv);
}
/* Check the syntax */
switch (argc) {
case 1:
/* Check the syntax */
switch (argc) {
case 1:
- return cmd_usage(cmdtp);
case 2: /* env_ask envname */
sprintf(message, "Please enter '%s':", argv[1]);
case 2: /* env_ask envname */
sprintf(message, "Please enter '%s':", argv[1]);
char *init_val;
if (argc < 2)
char *init_val;
if (argc < 2)
- return cmd_usage(cmdtp);
/* Set read buffer to initial value or empty sting */
init_val = getenv(argv[1]);
/* Set read buffer to initial value or empty sting */
init_val = getenv(argv[1]);
int argc, char * const argv[])
{
if (argc != 2 || strcmp(argv[1], "-f") != 0)
int argc, char * const argv[])
{
if (argc != 2 || strcmp(argv[1], "-f") != 0)
- return cmd_usage(cmdtp);
set_default_env("## Resetting to default environment\n");
return 0;
set_default_env("## Resetting to default environment\n");
return 0;
sep = '\n';
break;
default:
sep = '\n';
break;
default:
- return cmd_usage(cmdtp);
}
}
NXTARG: ;
}
if (argc < 1)
}
}
NXTARG: ;
}
if (argc < 1)
- return cmd_usage(cmdtp);
addr = (char *)simple_strtoul(argv[0], NULL, 16);
addr = (char *)simple_strtoul(argv[0], NULL, 16);
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
if (!fmt)
printf("## Warning: defaulting to text format\n");
if (!fmt)
printf("## Warning: defaulting to text format\n");
cmd_tbl_t *cp;
if (argc < 2)
cmd_tbl_t *cp;
if (argc < 2)
- return cmd_usage(cmdtp);
/* drop initial "env" arg */
argc--;
/* drop initial "env" arg */
argc--;
if (cp)
return cp->cmd(cmdtp, flag, argc, argv);
if (cp)
return cp->cmd(cmdtp, flag, argc, argv);
- return cmd_usage(cmdtp);
size_t retlen = 0;
if (argc < 3)
size_t retlen = 0;
if (argc < 3)
- return cmd_usage(cmdtp);
s = strchr(argv[0], '.');
if ((s != NULL) && (!strcmp(s, ".oob")))
s = strchr(argv[0], '.');
if ((s != NULL) && (!strcmp(s, ".oob")))
size_t retlen = 0;
if (argc < 3)
size_t retlen = 0;
if (argc < 3)
- return cmd_usage(cmdtp);
if (strncmp(argv[0] + 6, "yaffs", 5) == 0)
withoob = 1;
if (strncmp(argv[0] + 6, "yaffs", 5) == 0)
withoob = 1;
- return cmd_usage(cmdtp);
s = strchr(argv[0], '.');
ofs = (int)simple_strtoul(argv[1], NULL, 16);
s = strchr(argv[0], '.');
ofs = (int)simple_strtoul(argv[1], NULL, 16);
argv += 2;
if (argc <= 0)
argv += 2;
if (argc <= 0)
- return cmd_usage(cmdtp);
while (argc > 0) {
addr = simple_strtoul(*argv, NULL, 16);
while (argc > 0) {
addr = simple_strtoul(*argv, NULL, 16);
cmd_tbl_t *c;
if (argc < 2)
cmd_tbl_t *c;
if (argc < 2)
- return cmd_usage(cmdtp);
if (c)
return c->cmd(cmdtp, flag, argc, argv);
else
if (c)
return c->cmd(cmdtp, flag, argc, argv);
else
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
}
/***************************************************/
}
/***************************************************/
uint value = out_last_value;
if (argc != 3)
uint value = out_last_value;
if (argc != 3)
- return cmd_usage(cmdtp);
if ((flag & CMD_FLAG_REPEAT) == 0) {
/*
if ((flag & CMD_FLAG_REPEAT) == 0) {
/*
uint size = in_last_size;
if (argc != 2)
uint size = in_last_size;
if (argc != 2)
- return cmd_usage(cmdtp);
if ((flag & CMD_FLAG_REPEAT) == 0) {
/*
if ((flag & CMD_FLAG_REPEAT) == 0) {
/*
- return cmd_usage(cmdtp);
pxefile_addr_str = from_env("pxefile_addr_r");
pxefile_addr_str = from_env("pxefile_addr_r");
} else if (argc == 2) {
pxefile_addr_str = argv[1];
} else {
} else if (argc == 2) {
pxefile_addr_str = argv[1];
} else {
- return cmd_usage(cmdtp);
}
if (strict_strtoul(pxefile_addr_str, 16, &pxefile_addr_r) < 0) {
}
if (strict_strtoul(pxefile_addr_str, 16, &pxefile_addr_r) < 0) {
cmd_tbl_t *cp;
if (argc < 2)
cmd_tbl_t *cp;
if (argc < 2)
- return cmd_usage(cmdtp);
/* drop initial "pxe" arg */
argc--;
/* drop initial "pxe" arg */
argc--;
if (cp)
return cp->cmd(cmdtp, flag, argc, argv);
if (cp)
return cp->cmd(cmdtp, flag, argc, argv);
- return cmd_usage(cmdtp);
int part_length;
if (argc < 3)
int part_length;
if (argc < 3)
- return cmd_usage(cmdtp);
dev = (int)simple_strtoul (argv[2], &ep, 16);
dev_desc = get_dev(argv[1],dev);
dev = (int)simple_strtoul (argv[2], &ep, 16);
dev_desc = get_dev(argv[1],dev);
- return cmd_usage(cmdtp);
switch (argc) {
case 0:
case 1:
switch (argc) {
case 0:
case 1:
- return cmd_usage(cmdtp);
case 2:
if (strncmp(argv[1],"inf", 3) == 0) {
int i;
case 2:
if (strncmp(argv[1],"inf", 3) == 0) {
int i;
- return cmd_usage(cmdtp);
case 3:
if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10);
case 3:
if (strncmp(argv[1], "dev", 3) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10);
- return cmd_usage(cmdtp);
default: /* at least 4 args */
if (strcmp(argv[1], "read") == 0) {
default: /* at least 4 args */
if (strcmp(argv[1], "read") == 0) {
n, (n == cnt) ? "OK" : "ERROR");
return (n == cnt) ? 0 : 1;
} else {
n, (n == cnt) ? "OK" : "ERROR");
return (n == cnt) ? 0 : 1;
} else {
- return cmd_usage(cmdtp);
boot_device = argv[2];
break;
default:
boot_device = argv[2];
break;
default:
- return cmd_usage(cmdtp);
int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
switch (argc) {
int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
switch (argc) {
- case 0:
- case 1: return cmd_usage(cmdtp);
+ case 0:
+ case 1:
+ return CMD_RET_USAGE;
if (strncmp(argv[1],"res",3) == 0) {
printf("\nReset SCSI\n");
scsi_bus_reset();
if (strncmp(argv[1],"res",3) == 0) {
printf("\nReset SCSI\n");
scsi_bus_reset();
printf("\nno SCSI devices available\n");
return 1;
}
printf("\nno SCSI devices available\n");
return 1;
}
- return cmd_usage(cmdtp);
case 3:
if (strncmp(argv[1],"dev",3) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10);
case 3:
if (strncmp(argv[1],"dev",3) == 0) {
int dev = (int)simple_strtoul(argv[2], NULL, 10);
- return cmd_usage(cmdtp);
default:
/* at least 4 args */
if (strcmp(argv[1],"read") == 0) {
default:
/* at least 4 args */
if (strcmp(argv[1],"read") == 0) {
return 0;
}
} /* switch */
return 0;
}
} /* switch */
- return cmd_usage(cmdtp);
}
/****************************************************************************************
}
/****************************************************************************************
/* Validate arguments */
if ((argc != 5) || (strlen(argv[3]) != 1))
/* Validate arguments */
if ((argc != 5) || (strlen(argv[3]) != 1))
- return cmd_usage(cmdtp);
w = cmd_get_data_size(argv[0], 4);
w = cmd_get_data_size(argv[0], 4);
- return cmd_usage(cmdtp);
u8 output[20];
if (argc < 3)
u8 output[20];
if (argc < 3)
- return cmd_usage(cmdtp);
addr = simple_strtoul(argv[1], NULL, 16);
len = simple_strtoul(argv[2], NULL, 16);
addr = simple_strtoul(argv[1], NULL, 16);
len = simple_strtoul(argv[2], NULL, 16);
int do_strings(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc == 1)
int do_strings(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc == 1)
- return cmd_usage(cmdtp);
if ((flag & CMD_FLAG_REPEAT) == 0) {
start_addr = (char *)simple_strtoul(argv[1], NULL, 16);
if ((flag & CMD_FLAG_REPEAT) == 0) {
start_addr = (char *)simple_strtoul(argv[1], NULL, 16);
return 1;
}
if (argc > cmdtp->maxargs)
return 1;
}
if (argc > cmdtp->maxargs)
- return cmd_usage(cmdtp);
/*
* TODO(clchiou): get_timer_masked() is only defined in certain ARM
/*
* TODO(clchiou): get_timer_masked() is only defined in certain ARM
int retval = 0;
if (argc == 1)
int retval = 0;
if (argc == 1)
- return cmd_usage(cmdtp);
retval = run_command_and_time_it(0, argc - 1, argv + 1, &cycles);
report_time(cycles);
retval = run_command_and_time_it(0, argc - 1, argv + 1, &cycles);
report_time(cycles);
int err = 0;
if (argc < 2)
int err = 0;
if (argc < 2)
- return cmd_usage(cmdtp);
if (mtdparts_init() != 0) {
printf("Error initializing mtdparts!\n");
if (mtdparts_init() != 0) {
printf("Error initializing mtdparts!\n");
- return cmd_usage(cmdtp);
#ifdef CONFIG_CMD_UBIFS
/*
#ifdef CONFIG_CMD_UBIFS
/*
- return cmd_usage(cmdtp);
vol_name = argv[1];
debug("Using volume %s\n", vol_name);
vol_name = argv[1];
debug("Using volume %s\n", vol_name);
int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc != 1)
int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
if (argc != 1)
- return cmd_usage(cmdtp);
if (ubifs_initialized == 0) {
printf("No UBIFS volume mounted!\n");
if (ubifs_initialized == 0) {
printf("No UBIFS volume mounted!\n");
- return cmd_usage(cmdtp);
addr = simple_strtoul(argv[1], &endp, 16);
if (endp == argv[1])
addr = simple_strtoul(argv[1], &endp, 16);
if (endp == argv[1])
- return cmd_usage(cmdtp);
filename = argv[2];
if (argc == 4) {
size = simple_strtoul(argv[3], &endp, 16);
if (endp == argv[3])
filename = argv[2];
if (argc == 4) {
size = simple_strtoul(argv[3], &endp, 16);
if (endp == argv[3])
- return cmd_usage(cmdtp);
}
debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
}
debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
dst = simple_strtoul(argv[2], NULL, 16);
break;
default:
dst = simple_strtoul(argv[2], NULL, 16);
break;
default:
- return cmd_usage(cmdtp);
}
if (gunzip((void *) dst, dst_len, (void *) src, &src_len) != 0)
}
if (gunzip((void *) dst, dst_len, (void *) src, &src_len) != 0)
boot_device = argv[2];
break;
default:
boot_device = argv[2];
break;
default:
- return cmd_usage(cmdtp);
- return cmd_usage(cmdtp);
if ((strncmp(argv[1], "reset", 5) == 0) ||
(strncmp(argv[1], "start", 5) == 0)) {
if ((strncmp(argv[1], "reset", 5) == 0) ||
(strncmp(argv[1], "start", 5) == 0)) {
return 0;
}
#endif /* CONFIG_USB_STORAGE */
return 0;
}
#endif /* CONFIG_USB_STORAGE */
- return cmd_usage(cmdtp);
}
#ifdef CONFIG_USB_STORAGE
}
#ifdef CONFIG_USB_STORAGE
- return cmd_usage(cmdtp);
for (i=1; i<argc; ++i) {
char *arg;
for (i=1; i<argc; ++i) {
char *arg;