[U-Boot] [PATCH v2 0/9] Unified command execution in one place
At present two parsers have similar code to execute commands. Also cmd_usage() is called all over the place. This series adds a single function which processes commands called cmd_process().
This new function understands return codes, and in particular CMD_RET_USAGE to indicate a usage error. So rather than calling cmd_usage() themselves, the command handlers can just return this error.
There appears to be a run_command2() which is used to run commands with the selected parser. This series changes this in two separate steps to just run_command(), and renames the old run_command() to builtin_run_command(). No one should call this outside main.c since if the hush parser is being used it is wrong to call it. The built-in parser code could move into a separate file perhaps in a future patch.
The overall series reduces code size on ARM by about 1KB on my ~160KB U-Boot text region when the hush parser is used, and around 60 bytes when it isn't.
As an aside the only user of parse_line() is fsl_ddr_interactive() which seems to have its own command line interface which operates before DRAM is set up. Do I have this right? Is there no way this could be done later from a normal U-Boot command?
(I have run this through MAKEALL and it seems clean)
Changes in v2: - Fix minor errors one of which created a warning - Squash i2c patch into the common/ patch
Simon Glass (9): Remove CMD_PXE's static on run_command() Rename run_command() to builtin_run_command() Rename run_command2() to run_command() Stop using builtin_run_command() Don't include standard parser if hush is used Create a single cmd_call() function to handle command execution Remove interleave of non-U-Boot code in hush Add cmd_process() to process commands in one place Convert cmd_usage() calls in common to use a return value
arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 7 +-- board/esd/common/cmd_loadpci.c | 2 +- board/esd/du440/du440.c | 2 +- common/cmd_bedbug.c | 6 +- common/cmd_bmp.c | 6 +- common/cmd_boot.c | 2 +- common/cmd_bootm.c | 10 +--- common/cmd_cache.c | 4 +- common/cmd_dataflash_mmc_mux.c | 2 +- common/cmd_date.c | 3 +- common/cmd_dcr.c | 8 +- common/cmd_df.c | 2 +- common/cmd_eeprom.c | 2 +- common/cmd_ext2.c | 4 +- common/cmd_fdc.c | 2 +- common/cmd_fdos.c | 2 +- common/cmd_fdt.c | 14 ++-- common/cmd_fitupd.c | 2 +- common/cmd_flash.c | 14 ++-- common/cmd_fpga.c | 4 +- common/cmd_gpio.c | 2 +- common/cmd_i2c.c | 32 +++++----- common/cmd_ide.c | 10 ++-- common/cmd_irq.c | 2 +- common/cmd_itest.c | 2 +- common/cmd_led.c | 6 +- common/cmd_load.c | 2 +- common/cmd_log.c | 4 +- common/cmd_md5sum.c | 2 +- common/cmd_mdio.c | 2 +- common/cmd_mem.c | 22 ++++---- common/cmd_mfsl.c | 10 ++-- common/cmd_mgdisk.c | 2 +- common/cmd_mii.c | 4 +- common/cmd_misc.c | 2 +- common/cmd_mmc.c | 14 ++-- common/cmd_mmc_spi.c | 3 +- common/cmd_mp.c | 8 +- common/cmd_mtdparts.c | 2 +- common/cmd_nand.c | 6 +- common/cmd_net.c | 6 +- common/cmd_nvedit.c | 22 ++++---- common/cmd_onenand.c | 12 ++-- common/cmd_otp.c | 2 +- common/cmd_pci.c | 2 +- common/cmd_portio.c | 4 +- common/cmd_pxe.c | 10 ++-- common/cmd_reiser.c | 4 +- common/cmd_sata.c | 8 +- common/cmd_scsi.c | 15 +++-- common/cmd_setexpr.c | 2 +- common/cmd_sf.c | 2 +- common/cmd_sha1sum.c | 2 +- common/cmd_source.c | 2 +- common/cmd_strings.c | 2 +- common/cmd_time.c | 4 +- common/cmd_ubi.c | 4 +- common/cmd_ubifs.c | 10 ++-- common/cmd_unzip.c | 2 +- common/cmd_usb.c | 6 +- common/command.c | 60 ++++++++++++++++++++ common/hush.c | 73 +++++++----------------- common/main.c | 98 +++++++++++---------------------- include/command.h | 24 ++++++++ include/common.h | 5 +- 65 files changed, 311 insertions(+), 305 deletions(-)
It really isn't clear why this is here and there is no comment, so drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/main.c | 3 --- include/common.h | 2 -- 2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/common/main.c b/common/main.c index e96c95a..3ebe9f1 100644 --- a/common/main.c +++ b/common/main.c @@ -269,9 +269,6 @@ int abortboot(int bootdelay) /* * Return 0 on success, or != 0 on error. */ -#ifndef CONFIG_CMD_PXE -static inline -#endif int run_command2(const char *cmd, int flag) { #ifndef CONFIG_SYS_HUSH_PARSER diff --git a/include/common.h b/include/common.h index 05a658c..a7d4904 100644 --- a/include/common.h +++ b/include/common.h @@ -261,9 +261,7 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen); /* common/main.c */ void main_loop (void); int run_command (const char *cmd, int flag); -#ifdef CONFIG_CMD_PXE int run_command2(const char *cmd, int flag); -#endif int readline (const char *const prompt); int readline_into_buffer (const char *const prompt, char * buffer); int parse_line (char *, char *[]);
The current run_command() is only one of the options, with hush providing the other. It really shouldn't be called directly in case the hush parser is being used, so rename this function to better explain its purpose.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 +- board/esd/common/auto_update.c | 2 +- board/esd/common/cmd_loadpci.c | 2 +- board/esd/du440/du440.c | 2 +- common/cmd_bedbug.c | 2 +- common/cmd_bootm.c | 2 +- common/cmd_source.c | 4 ++-- common/main.c | 6 +++--- include/common.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index 8f04ddb..54d15ea 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -227,7 +227,7 @@ static void kw_sysrst_action(void)
debug("Starting %s process...\n", __FUNCTION__); #if !defined(CONFIG_SYS_HUSH_PARSER) - ret = run_command (s, 0); + ret = builtin_run_command(s, 0); #else ret = parse_string_outer(s, FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index fc60545..4cc15fa 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -169,7 +169,7 @@ int au_do_update(int i, long sz) k++; }
- run_command(addr, 0); + builtin_run_command(addr, 0); return 0; }
diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index 8f4ad84..c2bf279 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -110,7 +110,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * Call run_cmd */ printf("running command at addr 0x%s ...\n", addr); - run_command((char*)la, 0); + builtin_run_command((char *)la, 0); break;
default: diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c index 426321e..75fb200 100644 --- a/board/esd/du440/du440.c +++ b/board/esd/du440/du440.c @@ -831,7 +831,7 @@ int do_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) *d = '\0';
start = get_ticks(); - ret = run_command (cmd, 0); + ret = builtin_run_command(cmd, 0); end = get_ticks();
printf("ticks=%ld\n", (ulong)(end - start)); diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index 87b108f..0228ee8 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -237,7 +237,7 @@ void bedbug_main_loop (unsigned long addr, struct pt_regs *regs) if (len == -1) printf ("<INTERRUPT>\n"); else - rc = run_command (lastcommand, flag); + rc = builtin_run_command(lastcommand, flag);
if (rc <= 0) { /* invalid command or not repeatable, forget it */ diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index d5745b1..2e3e159 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1046,7 +1046,7 @@ int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int rcode = 0;
#ifndef CONFIG_SYS_HUSH_PARSER - if (run_command(getenv("bootcmd"), flag) < 0) + if (builtin_run_command(getenv("bootcmd"), flag) < 0) rcode = 1; #else if (parse_string_outer(getenv("bootcmd"), diff --git a/common/cmd_source.c b/common/cmd_source.c index 16a627a..481241c 100644 --- a/common/cmd_source.c +++ b/common/cmd_source.c @@ -179,7 +179,7 @@ source (ulong addr, const char *fit_uname) if (*line) { debug ("** exec: "%s"\n", line); - if (run_command (line, 0) < 0) { + if (builtin_run_command(line, 0) < 0) { rcode = 1; break; } @@ -189,7 +189,7 @@ source (ulong addr, const char *fit_uname) ++next; } if (rcode == 0 && *line) - rcode = (run_command(line, 0) >= 0); + rcode = (builtin_run_command(line, 0) >= 0); } #endif free (cmd); diff --git a/common/main.c b/common/main.c index 3ebe9f1..c3cae13 100644 --- a/common/main.c +++ b/common/main.c @@ -275,7 +275,7 @@ int run_command2(const char *cmd, int flag) /* * run_command can return 0 or 1 for success, so clean up its result. */ - if (run_command(cmd, flag) == -1) + if (builtin_run_command(cmd, flag) == -1) return 1;
return 0; @@ -453,7 +453,7 @@ void main_loop (void) if (len == -1) puts ("<INTERRUPT>\n"); else - rc = run_command (lastcommand, flag); + rc = builtin_run_command(lastcommand, flag);
if (rc <= 0) { /* invalid command or not repeatable, forget it */ @@ -1262,7 +1262,7 @@ static void process_macros (const char *input, char *output) * creates or modifies environment variables (like "bootp" does). */
-int run_command (const char *cmd, int flag) +int builtin_run_command(const char *cmd, int flag) { cmd_tbl_t *cmdtp; char cmdbuf[CONFIG_SYS_CBSIZE]; /* working copy of cmd */ diff --git a/include/common.h b/include/common.h index a7d4904..a2132a2 100644 --- a/include/common.h +++ b/include/common.h @@ -260,7 +260,7 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
/* common/main.c */ void main_loop (void); -int run_command (const char *cmd, int flag); +int builtin_run_command(const char *cmd, int flag); int run_command2(const char *cmd, int flag); int readline (const char *const prompt); int readline_into_buffer (const char *const prompt, char * buffer);
This is a more sensible name, so rename it.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/cmd_pxe.c | 2 +- common/main.c | 10 +++++----- include/common.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 9426f5b..673ca61 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -537,7 +537,7 @@ static int label_localboot(struct pxe_label *label)
printf("running: %s\n", dupcmd);
- ret = run_command2(dupcmd, 0); + ret = run_command(dupcmd, 0);
free(dupcmd);
diff --git a/common/main.c b/common/main.c index c3cae13..62de019 100644 --- a/common/main.c +++ b/common/main.c @@ -269,7 +269,7 @@ int abortboot(int bootdelay) /* * Return 0 on success, or != 0 on error. */ -int run_command2(const char *cmd, int flag) +int run_command(const char *cmd, int flag) { #ifndef CONFIG_SYS_HUSH_PARSER /* @@ -351,7 +351,7 @@ void main_loop (void) int prev = disable_ctrlc(1); /* disable Control C checking */ # endif
- run_command2(p, 0); + run_command(p, 0);
# ifdef CONFIG_AUTOBOOT_KEYED disable_ctrlc(prev); /* restore Control C checking */ @@ -396,7 +396,7 @@ void main_loop (void) int prev = disable_ctrlc(1); /* disable Control C checking */ # endif
- run_command2(s, 0); + run_command(s, 0);
# ifdef CONFIG_AUTOBOOT_KEYED disable_ctrlc(prev); /* restore Control C checking */ @@ -407,7 +407,7 @@ void main_loop (void) if (menukey == CONFIG_MENUKEY) { s = getenv("menucmd"); if (s) - run_command2(s, 0); + run_command(s, 0); } #endif /* CONFIG_MENUKEY */ #endif /* CONFIG_BOOTDELAY */ @@ -1405,7 +1405,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) return 1; }
- if (run_command2(arg, flag) != 0) + if (run_command(arg, flag) != 0) return 1; } return 0; diff --git a/include/common.h b/include/common.h index a2132a2..0ae0ea2 100644 --- a/include/common.h +++ b/include/common.h @@ -261,7 +261,7 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen); /* common/main.c */ void main_loop (void); int builtin_run_command(const char *cmd, int flag); -int run_command2(const char *cmd, int flag); +int run_command(const char *cmd, int flag); int readline (const char *const prompt); int readline_into_buffer (const char *const prompt, char * buffer); int parse_line (char *, char *[]);
This function is only one of the parser options, so use run_command() instead. It knows how to use hush if selected.
Signed-off-by: Simon Glass sjg@chromium.org ---
arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 7 +---- board/esd/common/auto_update.c | 2 +- board/esd/common/cmd_loadpci.c | 2 +- board/esd/du440/du440.c | 2 +- common/cmd_bedbug.c | 2 +- common/cmd_bootm.c | 8 +----- common/cmd_source.c | 4 +- common/main.c | 43 ++++++++++++++++----------------- include/common.h | 1 - 9 files changed, 29 insertions(+), 42 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index 54d15ea..fba5e01 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -226,12 +226,7 @@ static void kw_sysrst_action(void) }
debug("Starting %s process...\n", __FUNCTION__); -#if !defined(CONFIG_SYS_HUSH_PARSER) - ret = builtin_run_command(s, 0); -#else - ret = parse_string_outer(s, FLAG_PARSE_SEMICOLON - | FLAG_EXIT_FROM_LOOP); -#endif + ret = run_command(s, 0); if (ret < 0) debug("Error.. %s failed\n", __FUNCTION__); else diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 4cc15fa..fc60545 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -169,7 +169,7 @@ int au_do_update(int i, long sz) k++; }
- builtin_run_command(addr, 0); + run_command(addr, 0); return 0; }
diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index c2bf279..8fcae63 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -110,7 +110,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * Call run_cmd */ printf("running command at addr 0x%s ...\n", addr); - builtin_run_command((char *)la, 0); + run_command((char *)la, 0); break;
default: diff --git a/board/esd/du440/du440.c b/board/esd/du440/du440.c index 75fb200..1ada1bc 100644 --- a/board/esd/du440/du440.c +++ b/board/esd/du440/du440.c @@ -831,7 +831,7 @@ int do_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) *d = '\0';
start = get_ticks(); - ret = builtin_run_command(cmd, 0); + ret = run_command(cmd, 0); end = get_ticks();
printf("ticks=%ld\n", (ulong)(end - start)); diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index 0228ee8..5b08123 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -237,7 +237,7 @@ void bedbug_main_loop (unsigned long addr, struct pt_regs *regs) if (len == -1) printf ("<INTERRUPT>\n"); else - rc = builtin_run_command(lastcommand, flag); + rc = run_command(lastcommand, flag);
if (rc <= 0) { /* invalid command or not repeatable, forget it */ diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 2e3e159..6bfef62 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1045,14 +1045,8 @@ int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int rcode = 0;
-#ifndef CONFIG_SYS_HUSH_PARSER - if (builtin_run_command(getenv("bootcmd"), flag) < 0) + if (run_command(getenv("bootcmd"), flag) < 0) rcode = 1; -#else - if (parse_string_outer(getenv("bootcmd"), - FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0) - rcode = 1; -#endif return rcode; }
diff --git a/common/cmd_source.c b/common/cmd_source.c index 481241c..32fff5c 100644 --- a/common/cmd_source.c +++ b/common/cmd_source.c @@ -179,7 +179,7 @@ source (ulong addr, const char *fit_uname) if (*line) { debug ("** exec: "%s"\n", line); - if (builtin_run_command(line, 0) < 0) { + if (run_command(line, 0) < 0) { rcode = 1; break; } @@ -189,7 +189,7 @@ source (ulong addr, const char *fit_uname) ++next; } if (rcode == 0 && *line) - rcode = (builtin_run_command(line, 0) >= 0); + rcode = (run_command(line, 0) >= 0); } #endif free (cmd); diff --git a/common/main.c b/common/main.c index 62de019..59b87a1 100644 --- a/common/main.c +++ b/common/main.c @@ -266,25 +266,6 @@ int abortboot(int bootdelay) # endif /* CONFIG_AUTOBOOT_KEYED */ #endif /* CONFIG_BOOTDELAY >= 0 */
-/* - * Return 0 on success, or != 0 on error. - */ -int run_command(const char *cmd, int flag) -{ -#ifndef CONFIG_SYS_HUSH_PARSER - /* - * run_command can return 0 or 1 for success, so clean up its result. - */ - if (builtin_run_command(cmd, flag) == -1) - return 1; - - return 0; -#else - return parse_string_outer(cmd, - FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); -#endif -} - /****************************************************************************/
void main_loop (void) @@ -453,7 +434,7 @@ void main_loop (void) if (len == -1) puts ("<INTERRUPT>\n"); else - rc = builtin_run_command(lastcommand, flag); + rc = run_command(lastcommand, flag);
if (rc <= 0) { /* invalid command or not repeatable, forget it */ @@ -1261,8 +1242,7 @@ static void process_macros (const char *input, char *output) * the environment data, which may change magicly when the command we run * creates or modifies environment variables (like "bootp" does). */ - -int builtin_run_command(const char *cmd, int flag) +static int builtin_run_command(const char *cmd, int flag) { cmd_tbl_t *cmdtp; char cmdbuf[CONFIG_SYS_CBSIZE]; /* working copy of cmd */ @@ -1387,6 +1367,25 @@ int builtin_run_command(const char *cmd, int flag) return rc ? rc : repeatable; }
+/* + * Return 0 on success, or != 0 on error. + */ +int run_command(const char *cmd, int flag) +{ +#ifndef CONFIG_SYS_HUSH_PARSER + /* + * run_command can return 0 or 1 for success, so clean up its result. + */ + if (builtin_run_command(cmd, flag) == -1) + return 1; + + return 0; +#else + return parse_string_outer(cmd, + FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); +#endif +} + /****************************************************************************/
#if defined(CONFIG_CMD_RUN) diff --git a/include/common.h b/include/common.h index 0ae0ea2..a08a937 100644 --- a/include/common.h +++ b/include/common.h @@ -260,7 +260,6 @@ int print_buffer (ulong addr, void* data, uint width, uint count, uint linelen);
/* common/main.c */ void main_loop (void); -int builtin_run_command(const char *cmd, int flag); int run_command(const char *cmd, int flag); int readline (const char *const prompt); int readline_into_buffer (const char *const prompt, char * buffer);
Dear Simon Glass,
In message 1323542641-14541-5-git-send-email-sjg@chromium.org you wrote:
This function is only one of the parser options, so use run_command() instead. It knows how to use hush if selected.
...
debug("Starting %s process...\n", __FUNCTION__); -#if !defined(CONFIG_SYS_HUSH_PARSER)
- ret = builtin_run_command(s, 0);
-#else
- ret = parse_string_outer(s, FLAG_PARSE_SEMICOLON
| FLAG_EXIT_FROM_LOOP);-#endif
- ret = run_command(s, 0); if (ret < 0) debug("Error.. %s failed\n", __FUNCTION__);
...
-#ifndef CONFIG_SYS_HUSH_PARSER
- if (builtin_run_command(getenv("bootcmd"), flag) < 0)
- if (run_command(getenv("bootcmd"), flag) < 0) rcode = 1;
-#else
- if (parse_string_outer(getenv("bootcmd"),
FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0)rcode = 1;-#endif
I think this breaks error handling in a large scale.
run_command2() in "common/main.c" (now renamed into run_command() will return 0 or 1 when used with the hush shell; it will never return < 0.
Please fix globally.
Best regards,
Wolfgang Denk
Hi Wolfgang,
On Fri, Jan 13, 2012 at 11:27 AM, Wolfgang Denk wd@denx.de wrote:
Dear Simon Glass,
In message 1323542641-14541-5-git-send-email-sjg@chromium.org you wrote:
This function is only one of the parser options, so use run_command() instead. It knows how to use hush if selected.
...
debug("Starting %s process...\n", __FUNCTION__); -#if !defined(CONFIG_SYS_HUSH_PARSER)
- ret = builtin_run_command(s, 0);
-#else
- ret = parse_string_outer(s, FLAG_PARSE_SEMICOLON
- | FLAG_EXIT_FROM_LOOP);
-#endif
- ret = run_command(s, 0);
if (ret < 0) debug("Error.. %s failed\n", __FUNCTION__);
...
-#ifndef CONFIG_SYS_HUSH_PARSER
- if (builtin_run_command(getenv("bootcmd"), flag) < 0)
- if (run_command(getenv("bootcmd"), flag) < 0)
rcode = 1; -#else
- if (parse_string_outer(getenv("bootcmd"),
- FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0)
- rcode = 1;
-#endif
I think this breaks error handling in a large scale.
run_command2() in "common/main.c" (now renamed into run_command() will return 0 or 1 when used with the hush shell; it will never return < 0.
Thanks for looking at this. I will see what I can figure out.
Regards, Simon
Please fix globally.
Best regards,
Wolfgang Denk
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de Parkinson's Law: Work expands to fill the time alloted it.
Dear Simon Glass,
In message CAPnjgZ1=1+xjHoAbJd4WETjC6Bj+6NPgGsXbStoGadieznF1=Q@mail.gmail.com you wrote:
run_command2() in "common/main.c" (now renamed into run_command() will return 0 or 1 when used with the hush shell; it will never return < 0.
Thanks for looking at this. I will see what I can figure out.
I think there is some pre-existing inconsistency here, which pops up when you try to unify the code.
I think we should implement standard shell handline here: commands return EXIT_SUCCESS or EXIT_FAILURE.
Best regards,
Wolfgang Denk
Hi Wolfgang,
On Fri, Jan 13, 2012 at 1:25 PM, Wolfgang Denk wd@denx.de wrote:
Dear Simon Glass,
In message CAPnjgZ1=1+xjHoAbJd4WETjC6Bj+6NPgGsXbStoGadieznF1=Q@mail.gmail.com you wrote:
run_command2() in "common/main.c" (now renamed into run_command() will return 0 or 1 when used with the hush shell; it will never return < 0.
Thanks for looking at this. I will see what I can figure out.
I think there is some pre-existing inconsistency here, which pops up when you try to unify the code.
I think we should implement standard shell handline here: commands return EXIT_SUCCESS or EXIT_FAILURE.
My hope was that I could return an additional code to indicate that cmd_usage() should be called. This helps with code size and tidiness. Do you think it is possible at all?
Regards, Simon
Best regards,
Wolfgang Denk
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de The most exciting phrase to hear in science, the one that heralds new discoveries, is not "Eureka!" (I found it!) but "That's funny ..." -- Isaac Asimov
Hi Wolfgang,
On Fri, Jan 13, 2012 at 1:33 PM, Simon Glass sjg@chromium.org wrote:
Hi Wolfgang,
On Fri, Jan 13, 2012 at 1:25 PM, Wolfgang Denk wd@denx.de wrote:
Dear Simon Glass,
In message CAPnjgZ1=1+xjHoAbJd4WETjC6Bj+6NPgGsXbStoGadieznF1=Q@mail.gmail.com you wrote:
run_command2() in "common/main.c" (now renamed into run_command() will return 0 or 1 when used with the hush shell; it will never return < 0.
Thanks for looking at this. I will see what I can figure out.
I think there is some pre-existing inconsistency here, which pops up when you try to unify the code.
I think we should implement standard shell handline here: commands return EXIT_SUCCESS or EXIT_FAILURE.
I have had another look at this and simplified it a bit. Basically cmd_process() was the point of unification for command execution, so I have made that always return either 0 or 1. I think that should solve any problems. I will send out a v4 series.
Regarding what commands return, I believe it is now true that commands are only called in one place. That place checks the return value for CMD_RET_USAGE. If it sees it, it calls cmd_usage() and returns 1. So CMD_RET_USAGE is never returned outside cmd_process(). It should just be a convenience for the command functions. In any case, all of the replacements of cmd_usage() with 'return CMD_RET_USAGE' are in the final patch if you want to leave that one out.
I have tested with sandbox using hush and without. If there is still a problem please tell me how to repeat it, and I will take another look.
Regards, Simon
Regards, Simon
Best regards,
Wolfgang Denk
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de The most exciting phrase to hear in science, the one that heralds new discoveries, is not "Eureka!" (I found it!) but "That's funny ..." -- Isaac Asimov
This saves about 1KB of code space on ARM with CONFIG_SYS_HUSH_PARSER defined.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/common/main.c b/common/main.c index 59b87a1..11027f7 100644 --- a/common/main.c +++ b/common/main.c @@ -1116,6 +1116,7 @@ int parse_line (char *line, char *argv[])
/****************************************************************************/
+#ifndef CONFIG_SYS_HUSH_PARSER static void process_macros (const char *input, char *output) { char c, prev; @@ -1366,6 +1367,7 @@ static int builtin_run_command(const char *cmd, int flag)
return rc ? rc : repeatable; } +#endif
/* * Return 0 on success, or != 0 on error.
We should aim for a single point of entry to the commands, whichever parser is used.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/command.c | 21 +++++++++++++++++++++ common/hush.c | 9 +++------ common/main.c | 3 +-- include/command.h | 5 +++++ 4 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/common/command.c b/common/command.c index c5cecd3..d402e0f 100644 --- a/common/command.c +++ b/common/command.c @@ -487,3 +487,24 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size) } } #endif + +/** + * Call a command function. This should be the only route in U-Boot to call + * a command, so that we can track whether we are waiting for input or + * executing a command. + * + * @param cmdtp Pointer to the command to execute + * @param flag Some flags normally 0 (see CMD_FLAG_.. above) + * @param argc Number of arguments (arg 0 must be the command text) + * @param argv Arguments + * @return 0 if command succeeded, else non-zero + */ +int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int result; + + result = (cmdtp->cmd)(cmdtp, flag, argc, argv); + if (result) + debug("Command failed, result=%d", result); + return result; +} diff --git a/common/hush.c b/common/hush.c index e8e24d7..6cb921d 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1679,13 +1679,10 @@ static int run_pipe_real(struct pipe *pi) rcode = x->function(child); #else /* OK - call function to do the command */ - - rcode = (cmdtp->cmd) -(cmdtp, flag,child->argc-i,&child->argv[i]); - if ( !cmdtp->repeatable ) + rcode = cmd_call(cmdtp, flag, child->argc-i, + &child->argv[i]); + if (!cmdtp->repeatable) flag_repeat = 0; - - #endif child->argv-=i; /* XXX restore hack so free() can work right */ #ifndef __U_BOOT__ diff --git a/common/main.c b/common/main.c index 11027f7..f34ba71 100644 --- a/common/main.c +++ b/common/main.c @@ -1354,9 +1354,8 @@ static int builtin_run_command(const char *cmd, int flag) #endif
/* OK - call function to do the command */ - if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) { + if (cmd_call(cmdtp, flag, argc, argv) != 0) rc = -1; - }
repeatable &= cmdtp->repeatable;
diff --git a/include/command.h b/include/command.h index 3912b80..4316610 100644 --- a/include/command.h +++ b/include/command.h @@ -150,4 +150,9 @@ extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #if defined(CONFIG_NEEDS_MANUAL_RELOC) void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); #endif + +#ifndef __ASSEMBLY__ +int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +#endif /* __ASSEMBLY__ */ + #endif /* __COMMAND_H */
There is a nasty interleave of #ifdefs in hush.c where the two code paths have different indents. Remove this ickiness.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/hush.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/common/hush.c b/common/hush.c index 6cb921d..3aa9d50 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1642,6 +1642,15 @@ static int run_pipe_real(struct pipe *pi) * Is it really safe for inline use? Experimentally, * things seem to work with glibc. */ setup_redirects(child, squirrel); + + child->argv += i; /* XXX horrible hack */ + rcode = x->function(child); + /* XXX restore hack so free() can work right */ + child->argv -= i; + restore_redirects(squirrel); + } + return rcode; + } #else /* check ";", because ,example , argv consist from * "help;flinfo" must not execute @@ -1674,22 +1683,11 @@ static int run_pipe_real(struct pipe *pi) if ((child->argc - i) > cmdtp->maxargs) return cmd_usage(cmdtp); #endif - child->argv+=i; /* XXX horrible hack */ -#ifndef __U_BOOT__ - rcode = x->function(child); -#else /* OK - call function to do the command */ - rcode = cmd_call(cmdtp, flag, child->argc-i, - &child->argv[i]); + rcode = cmd_call(cmdtp, flag, child->argc, + child->argv); if (!cmdtp->repeatable) flag_repeat = 0; -#endif - child->argv-=i; /* XXX restore hack so free() can work right */ -#ifndef __U_BOOT__ - - restore_redirects(squirrel); -#endif - return rcode; } }
We currently have the same code in hush.c and main.c. This brings the code into one place.
As an added feature, if the command function returns CMD_RET_USAGE then U-Boot will print a usage message for the command.
ARM code size increases about 32 bytes with this clean-up.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/command.c | 43 ++++++++++++++++++++++++++++++++++++++- common/hush.c | 56 +++++++++++++++------------------------------------- common/main.c | 39 +++--------------------------------- include/command.h | 21 ++++++++++++++++++- 4 files changed, 81 insertions(+), 78 deletions(-)
diff --git a/common/command.c b/common/command.c index d402e0f..990e901 100644 --- a/common/command.c +++ b/common/command.c @@ -497,9 +497,9 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size) * @param flag Some flags normally 0 (see CMD_FLAG_.. above) * @param argc Number of arguments (arg 0 must be the command text) * @param argv Arguments - * @return 0 if command succeeded, else non-zero + * @return 0 if command succeeded, else non-zero (CMD_RET_...) */ -int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int result;
@@ -508,3 +508,42 @@ int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) debug("Command failed, result=%d", result); return result; } + +enum command_ret_t cmd_process(int flag, int argc, char * const argv[]) +{ + enum command_ret_t rc = CMD_RET_ERROR; + cmd_tbl_t *cmdtp; + + /* Look up command in command table */ + cmdtp = find_cmd(argv[0]); + if (cmdtp == NULL) + printf("Unknown command '%s' - try 'help'\n", argv[0]); + + /* found - check max args */ + else if (argc > cmdtp->maxargs) + rc = CMD_RET_USAGE; + +#if defined(CONFIG_CMD_BOOTD) + /* avoid "bootd" recursion */ + else if (cmdtp->cmd == do_bootd) { + if (flag & CMD_FLAG_BOOTD) + puts("'bootd' recursion detected\n"); + else { + flag |= CMD_FLAG_BOOTD; + rc = CMD_RET_OK; + } + } +#endif + else + rc = CMD_RET_OK; + + /* If OK so far, then do the command */ + if (!rc) + rc = cmd_call(cmdtp, flag, argc, argv); + + if (rc == CMD_RET_USAGE) + cmd_usage(cmdtp); + else if (rc == CMD_RET_OK && !cmdtp->repeatable) + return CMD_RET_NO_REPEAT; + return rc; +} diff --git a/common/hush.c b/common/hush.c index 3aa9d50..f8df3fc 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1538,8 +1538,8 @@ static int run_pipe_real(struct pipe *pi) int nextin; int flag = do_repeat ? CMD_FLAG_REPEAT : 0; struct child_prog *child; - cmd_tbl_t *cmdtp; char *p; + enum command_ret_t rc; # if __GNUC__ /* Avoid longjmp clobbering */ (void) &i; @@ -1652,47 +1652,23 @@ static int run_pipe_real(struct pipe *pi) return rcode; } #else - /* check ";", because ,example , argv consist from - * "help;flinfo" must not execute - */ - if (strchr(child->argv[i], ';')) { - printf ("Unknown command '%s' - try 'help' or use 'run' command\n", - child->argv[i]); - return -1; - } - /* Look up command in command table */ - - - if ((cmdtp = find_cmd(child->argv[i])) == NULL) { - printf ("Unknown command '%s' - try 'help'\n", child->argv[i]); - return -1; /* give up after bad command */ - } else { - int rcode; -#if defined(CONFIG_CMD_BOOTD) - /* avoid "bootd" recursion */ - if (cmdtp->cmd == do_bootd) { - if (flag & CMD_FLAG_BOOTD) { - printf ("'bootd' recursion detected\n"); - return -1; - } - else - flag |= CMD_FLAG_BOOTD; - } -#endif - /* found - check max args */ - if ((child->argc - i) > cmdtp->maxargs) - return cmd_usage(cmdtp); -#endif - /* OK - call function to do the command */ - rcode = cmd_call(cmdtp, flag, child->argc, - child->argv); - if (!cmdtp->repeatable) - flag_repeat = 0; - return rcode; - } + /* check ";", because ,example , argv consist from + * "help;flinfo" must not execute + */ + if (strchr(child->argv[i], ';')) { + printf("Unknown command '%s' - try 'help' or use " + "'run' command\n", child->argv[i]); + return -1; } -#ifndef __U_BOOT__ + /* Process the command */ + rc = cmd_process(flag, child->argc, child->argv); + if (rc == CMD_RET_NO_REPEAT) { + flag_repeat = 0; + rc = CMD_RET_OK; + } +#endif } +#ifndef __U_BOOT__
for (i = 0; i < pi->num_progs; i++) { child = & (pi->progs[i]); diff --git a/common/main.c b/common/main.c index f34ba71..6f247ce 100644 --- a/common/main.c +++ b/common/main.c @@ -1245,7 +1245,6 @@ static void process_macros (const char *input, char *output) */ static int builtin_run_command(const char *cmd, int flag) { - cmd_tbl_t *cmdtp; char cmdbuf[CONFIG_SYS_CBSIZE]; /* working copy of cmd */ char *token; /* start of token in cmdbuf */ char *sep; /* end of token (separator) in cmdbuf */ @@ -1323,41 +1322,11 @@ static int builtin_run_command(const char *cmd, int flag) continue; }
- /* Look up command in command table */ - if ((cmdtp = find_cmd(argv[0])) == NULL) { - printf ("Unknown command '%s' - try 'help'\n", argv[0]); - rc = -1; /* give up after bad command */ - continue; - } - - /* found - check max args */ - if (argc > cmdtp->maxargs) { - cmd_usage(cmdtp); - rc = -1; - continue; - } - -#if defined(CONFIG_CMD_BOOTD) - /* avoid "bootd" recursion */ - if (cmdtp->cmd == do_bootd) { -#ifdef DEBUG_PARSER - printf ("[%s]\n", finaltoken); -#endif - if (flag & CMD_FLAG_BOOTD) { - puts ("'bootd' recursion detected\n"); - rc = -1; - continue; - } else { - flag |= CMD_FLAG_BOOTD; - } + rc = cmd_process(flag, argc, argv); + if (rc == CMD_RET_NO_REPEAT) { + repeatable = 0; + rc = CMD_RET_OK; } -#endif - - /* OK - call function to do the command */ - if (cmd_call(cmdtp, flag, argc, argv) != 0) - rc = -1; - - repeatable &= cmdtp->repeatable;
/* Did the user stop this? */ if (had_ctrlc ()) diff --git a/include/command.h b/include/command.h index 4316610..b1a701c 100644 --- a/include/command.h +++ b/include/command.h @@ -152,7 +152,26 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); #endif
#ifndef __ASSEMBLY__ -int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +/* Error codes that cmd_process() can return */ +enum command_ret_t { + CMD_RET_OK, /* SUccess, and can repeat command */ + CMD_RET_ERROR = -1, /* An error occurred and was reported */ + CMD_RET_USAGE = -2, /* Please report 'usage' error */ + CMD_RET_RECURSE = -3, /* Recursion error detected */ + CMD_RET_UNKNOWN = -4, /* Unknown command */ + CMD_RET_NO_REPEAT = -5, /* Success, but cannot repeat command */ +}; + +/** + * Process a command with arguments. We look up the command and execute it + * if valid. Otherwise we print a usage message. + * + * @param flag Some flags normally 0 (see CMD_FLAG_.. above) + * @param argc Number of arguments (arg 0 must be the command text) + * @param argv Arguments + * @return value of command_rc_t depending on result + */ +enum command_ret_t cmd_process(int flag, int argc, char * const argv[]); #endif /* __ASSEMBLY__ */
#endif /* __COMMAND_H */
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 --- Changes in v2: - Fix minor errors one of which created a warning - Squash i2c patch into the common/ patch
common/cmd_bedbug.c | 4 ++-- common/cmd_bmp.c | 6 +++--- common/cmd_boot.c | 2 +- common/cmd_bootm.c | 4 ++-- common/cmd_cache.c | 4 ++-- common/cmd_dataflash_mmc_mux.c | 2 +- common/cmd_date.c | 3 +-- common/cmd_dcr.c | 8 ++++---- common/cmd_df.c | 2 +- common/cmd_eeprom.c | 2 +- common/cmd_ext2.c | 4 ++-- common/cmd_fdc.c | 2 +- common/cmd_fdos.c | 2 +- common/cmd_fdt.c | 14 +++++++------- common/cmd_fitupd.c | 2 +- common/cmd_flash.c | 14 +++++++------- common/cmd_fpga.c | 4 ++-- common/cmd_gpio.c | 2 +- common/cmd_i2c.c | 32 ++++++++++++++++---------------- common/cmd_ide.c | 10 +++++----- common/cmd_irq.c | 2 +- common/cmd_itest.c | 2 +- common/cmd_led.c | 6 +++--- common/cmd_load.c | 2 +- common/cmd_log.c | 4 ++-- common/cmd_md5sum.c | 2 +- common/cmd_mdio.c | 2 +- common/cmd_mem.c | 22 +++++++++++----------- common/cmd_mfsl.c | 10 +++++----- common/cmd_mgdisk.c | 2 +- common/cmd_mii.c | 4 ++-- common/cmd_misc.c | 2 +- common/cmd_mmc.c | 14 +++++++------- common/cmd_mmc_spi.c | 3 +-- common/cmd_mp.c | 8 ++++---- common/cmd_mtdparts.c | 2 +- common/cmd_nand.c | 6 +++--- common/cmd_net.c | 6 +++--- common/cmd_nvedit.c | 22 +++++++++++----------- common/cmd_onenand.c | 12 ++++++------ common/cmd_otp.c | 2 +- common/cmd_pci.c | 2 +- common/cmd_portio.c | 4 ++-- common/cmd_pxe.c | 8 ++++---- common/cmd_reiser.c | 4 ++-- common/cmd_sata.c | 8 ++++---- common/cmd_scsi.c | 15 ++++++++------- common/cmd_setexpr.c | 2 +- common/cmd_sf.c | 2 +- common/cmd_sha1sum.c | 2 +- common/cmd_strings.c | 2 +- common/cmd_time.c | 4 ++-- common/cmd_ubi.c | 4 ++-- common/cmd_ubifs.c | 10 +++++----- common/cmd_unzip.c | 2 +- common/cmd_usb.c | 6 +++--- common/main.c | 2 +- 57 files changed, 167 insertions(+), 168 deletions(-)
diff --git a/common/cmd_bedbug.c b/common/cmd_bedbug.c index 5b08123..9791423 100644 --- a/common/cmd_bedbug.c +++ b/common/cmd_bedbug.c @@ -84,7 +84,7 @@ int do_bedbug_dis (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) len = dis_last_len;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) { /* New command */ @@ -123,7 +123,7 @@ int do_bedbug_asm (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) int rcode = 0;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
printf ("\nEnter '.' when done\n"); mem_addr = simple_strtoul (argv[1], NULL, 16); diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 682f395..4c29fa3 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -102,7 +102,7 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[ addr = simple_strtoul(argv[1], NULL, 16); break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return (bmp_info(addr)); @@ -126,7 +126,7 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar y = simple_strtoul(argv[3], NULL, 10); break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return (bmp_display(addr, x, y)); @@ -166,7 +166,7 @@ static int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (c) return c->cmd(cmdtp, flag, argc, argv); else - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_boot.c b/common/cmd_boot.c index 0afd939..a799b33 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -43,7 +43,7 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int rcode = 0;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
addr = simple_strtoul(argv[1], NULL, 16);
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 6bfef62..9304584 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -493,12 +493,12 @@ int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc, } } else { /* Unrecognized command */ - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (images.state >= state) { printf("Trying to execute a command out of order\n"); - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
images.state |= state; diff --git a/common/cmd_cache.c b/common/cmd_cache.c index 9778d3b..8dca71f 100644 --- a/common/cmd_cache.c +++ b/common/cmd_cache.c @@ -54,7 +54,7 @@ int do_icache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) icache_status() ? "ON" : "OFF"); return 0; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } return 0; } @@ -83,7 +83,7 @@ int do_dcache ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) dcache_status() ? "ON" : "OFF"); return 0; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } return 0;
diff --git a/common/cmd_dataflash_mmc_mux.c b/common/cmd_dataflash_mmc_mux.c index 1678d6e..f8f1787 100644 --- a/common/cmd_dataflash_mmc_mux.c +++ b/common/cmd_dataflash_mmc_mux.c @@ -41,7 +41,7 @@ int do_dataflash_mmc_mux (cmd_tbl_t *cmdtp, int flag, int argc, char * const arg AT91F_GetMuxStatus () ? "MMC" : "SPI"); return 0; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } return 0; } diff --git a/common/cmd_date.c b/common/cmd_date.c index f0fa02a..335bc05 100644 --- a/common/cmd_date.c +++ b/common/cmd_date.c @@ -93,8 +93,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
break; default: - cmd_usage(cmdtp); - rcode = 1; + rcode = CMD_RET_USAGE; }
/* switch back to original I2C bus */ diff --git a/common/cmd_dcr.c b/common/cmd_dcr.c index 568e226..d3bbc36 100644 --- a/common/cmd_dcr.c +++ b/common/cmd_dcr.c @@ -45,7 +45,7 @@ int do_getdcr ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )
/* Validate arguments */ if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Get a DCR */ dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16); @@ -71,7 +71,7 @@ int do_setdcr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
/* Validate arguments */ if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Set a DCR */ dcrn = (unsigned short) simple_strtoul (argv[1], NULL, 16); @@ -116,7 +116,7 @@ int do_getidcr (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Validate arguments */ if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Find out whether ther is '.' (dot) symbol in the first parameter. */ strncpy (buf, argv[1], sizeof(buf)-1); @@ -170,7 +170,7 @@ int do_setidcr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
/* Validate arguments */ if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Find out whether ther is '.' (dot) symbol in the first parameter. */ strncpy (buf, argv[1], sizeof(buf)-1); diff --git a/common/cmd_df.c b/common/cmd_df.c index 9a3c84c..f7e5df3 100644 --- a/common/cmd_df.c +++ b/common/cmd_df.c @@ -27,7 +27,7 @@ static int do_df(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }
usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index e911377..b9f6a10 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -104,7 +104,7 @@ int do_eeprom ( cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } }
- return cmd_usage(cmdtp); + return CMD_RET_USAGE; } #endif
diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index 35fb361..79b1e2f 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -66,7 +66,7 @@ int do_ext2ls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int part_length;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
dev = (int)simple_strtoul (argv[2], &ep, 16); dev_desc = get_dev(argv[1],dev); @@ -163,7 +163,7 @@ int do_ext2load (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break;
default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (!filename) { diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index 4fe410d..66e0ef0 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -744,7 +744,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) boot_drive=simple_strtoul(argv[2], NULL, 10); break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } /* setup FDC and scan for drives */ if(fdc_setup(boot_drive,pCMD,pFG)==FALSE) { diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index 04a5e01..fbee861 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -72,7 +72,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) name = argv [2]; break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/* Init physical layer */ diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index 9bdecca..9a5c53e 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -66,7 +66,7 @@ void set_working_fdt_addr(void *addr) int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Set the address of the fdt @@ -123,7 +123,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) int err;
if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Set the address and length of the fdt. @@ -175,7 +175,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) * Parameters: Node path, new node to be appended to the path. */ if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
pathp = argv[2]; nodep = argv[3]; @@ -211,7 +211,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) * Parameters: Node path, property, optional value. */ if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
pathp = argv[2]; prop = argv[3]; @@ -409,7 +409,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } } else { /* Unrecognized command */ - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } } #ifdef CONFIG_OF_BOARD_SETUP @@ -422,7 +422,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) unsigned long initrd_start = 0, initrd_end = 0;
if ((argc != 2) && (argc != 4)) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (argc == 4) { initrd_start = simple_strtoul(argv[2], NULL, 16); @@ -438,7 +438,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) } else { /* Unrecognized command */ - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return 0; diff --git a/common/cmd_fitupd.c b/common/cmd_fitupd.c index 4d1192b..7a3789e 100644 --- a/common/cmd_fitupd.c +++ b/common/cmd_fitupd.c @@ -20,7 +20,7 @@ static int do_fitupd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong addr = 0UL;
if (argc > 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (argc == 2) addr = simple_strtoul(argv[1], NULL, 16); diff --git a/common/cmd_flash.c b/common/cmd_flash.c index c6ea25a..0e9b2e3 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -335,7 +335,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int rcode = 0;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (strcmp(argv[1], "all") == 0) { for (bank=1; bank<=CONFIG_SYS_MAX_FLASH_BANKS; ++bank) { @@ -384,7 +384,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif
if (argc != 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (strcmp(argv[1], "bank") == 0) { bank = simple_strtoul(argv[2], NULL, 16); @@ -405,7 +405,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }
if (addr_first >= addr_last) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
rcode = flash_sect_erase(addr_first, addr_last); return rcode; @@ -475,7 +475,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
#if !defined(CONFIG_SYS_NO_FLASH) || defined(CONFIG_HAS_DATAFLASH) if (strcmp(argv[1], "off") == 0) @@ -483,7 +483,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else if (strcmp(argv[1], "on") == 0) p = 1; else - return cmd_usage(cmdtp); + return CMD_RET_USAGE; #endif
#ifdef CONFIG_HAS_DATAFLASH @@ -583,7 +583,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif
if (argc != 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (strcmp(argv[2], "bank") == 0) { bank = simple_strtoul(argv[3], NULL, 16); @@ -623,7 +623,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }
if (addr_first >= addr_last) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
rcode = flash_sect_protect (p, addr_first, addr_last); #endif /* CONFIG_SYS_NO_FLASH */ diff --git a/common/cmd_fpga.c b/common/cmd_fpga.c index 8946345..31155d0 100644 --- a/common/cmd_fpga.c +++ b/common/cmd_fpga.c @@ -258,7 +258,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
switch (op) { case FPGA_NONE: - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
case FPGA_INFO: rc = fpga_info (dev); @@ -337,7 +337,7 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
default: printf ("Unknown operation\n"); - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } return (rc); } diff --git a/common/cmd_gpio.c b/common/cmd_gpio.c index 9cc790a..47eee89 100644 --- a/common/cmd_gpio.c +++ b/common/cmd_gpio.c @@ -38,7 +38,7 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (argc != 3) show_usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; str_cmd = argv[1]; str_gpio = argv[2];
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index e795139..2cdc4ed 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -190,7 +190,7 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv u_char *memaddr;
if (argc != 5) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * I2C chip address @@ -204,7 +204,7 @@ static int do_i2c_read ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv devaddr = simple_strtoul(argv[2], NULL, 16); alen = get_alen(argv[2]); if (alen > 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Length is the number of objects, not number of bytes. @@ -242,7 +242,7 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] length = i2c_dp_last_length;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) { /* @@ -261,7 +261,7 @@ static int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] addr = simple_strtoul(argv[2], NULL, 16); alen = get_alen(argv[2]); if (alen > 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * If another parameter, it is the length to display. @@ -330,7 +330,7 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] int count;
if ((argc < 4) || (argc > 5)) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Chip is always specified. @@ -343,7 +343,7 @@ static int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] addr = simple_strtoul(argv[2], NULL, 16); alen = get_alen(argv[2]); if (alen > 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Value to write is always specified. @@ -392,7 +392,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] ulong err;
if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Chip is always specified. @@ -405,7 +405,7 @@ static int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] addr = simple_strtoul(argv[2], NULL, 16); alen = get_alen(argv[2]); if (alen > 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Count is always specified @@ -451,7 +451,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg int nbytes;
if (argc != 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
#ifdef CONFIG_BOOT_RETRY_TIME reset_cmd_timeout(); /* got a good command to get here */ @@ -482,7 +482,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const arg addr = simple_strtoul(argv[2], NULL, 16); alen = get_alen(argv[2]); if (alen > 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/* @@ -613,7 +613,7 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] int delay;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Chip is always specified. @@ -626,7 +626,7 @@ static int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] addr = simple_strtoul(argv[2], NULL, 16); alen = get_alen(argv[2]); if (alen > 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Length is the number of objects, not number of bytes. @@ -765,7 +765,7 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) };
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * Chip is always specified. @@ -1300,7 +1300,7 @@ static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) cmd_tbl_t *c;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Strip off leading 'i2c' command argument */ argc--; @@ -1309,9 +1309,9 @@ static int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) 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); else - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/***************************************************/ diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 305c602..3fb7506 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -179,7 +179,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) switch (argc) { case 0: case 1: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; case 2: if (strncmp(argv[1], "res", 3) == 0) { puts("\nReset IDE" @@ -232,7 +232,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) } return rcode; } - return cmd_usage(cmdtp); + return CMD_RET_USAGE; case 3: if (strncmp(argv[1], "dev", 3) == 0) { int dev = (int) simple_strtoul(argv[2], NULL, 10); @@ -266,7 +266,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return rcode; }
- return cmd_usage(cmdtp); + return CMD_RET_USAGE; default: /* at least 4 args */
@@ -325,7 +325,7 @@ int do_ide(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) else return 1; } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return rcode; @@ -361,7 +361,7 @@ int do_diskboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) break; default: show_boot_progress(-42); - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } show_boot_progress(42);
diff --git a/common/cmd_irq.c b/common/cmd_irq.c index d35a43f..9f158ef 100644 --- a/common/cmd_irq.c +++ b/common/cmd_irq.c @@ -28,7 +28,7 @@ int do_interrupts(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) {
if (argc != 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* on */ if (strncmp(argv[1], "on", 2) == 0) diff --git a/common/cmd_itest.c b/common/cmd_itest.c index 2a238a4..d5df758 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -161,7 +161,7 @@ int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] )
/* Validate arguments */ if ((argc != 4)) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Check for a data width specification. * Defaults to long (4) if no specification. diff --git a/common/cmd_led.c b/common/cmd_led.c index f55f94c..d83b3ba 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -93,12 +93,12 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Validate arguments */ if ((argc != 3)) { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
cmd = get_led_cmd(argv[2]); if (cmd < 0) { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
for (i = 0; led_commands[i].string; i++) { @@ -132,7 +132,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* If we ran out of matches, print Usage */ if (!match) { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return 0; diff --git a/common/cmd_load.c b/common/cmd_load.c index dad0303..f4d66de 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -1102,7 +1102,7 @@ int do_hwflow (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (strcmp(argv[1], "on") == 0) hwflow_onoff(1); else - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } printf("RTS/CTS hardware flow control: %s\n", hwflow_onoff(0) ? "on" : "off"); return 0; diff --git a/common/cmd_log.c b/common/cmd_log.c index 249614f..f9fbe00 100644 --- a/common/cmd_log.c +++ b/common/cmd_log.c @@ -241,10 +241,10 @@ int do_log (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } return 0; } - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } }
diff --git a/common/cmd_md5sum.c b/common/cmd_md5sum.c index 629a74d..b93dd9b 100644 --- a/common/cmd_md5sum.c +++ b/common/cmd_md5sum.c @@ -32,7 +32,7 @@ static int do_md5sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) u8 output[16];
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
addr = simple_strtoul(argv[1], NULL, 16); len = simple_strtoul(argv[2], NULL, 16); diff --git a/common/cmd_mdio.c b/common/cmd_mdio.c index 4ac9de4..77d8df1 100644 --- a/common/cmd_mdio.c +++ b/common/cmd_mdio.c @@ -193,7 +193,7 @@ static int do_mdio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) struct mii_dev *bus;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * We use the last specified parameters, unless new ones are diff --git a/common/cmd_mem.c b/common/cmd_mem.c index f7e76d6..fa6f599 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -74,7 +74,7 @@ int do_mem_md ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) length = dp_last_length;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) { /* New command specified. Check for a size specification. @@ -168,7 +168,7 @@ int do_mem_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int size;
if ((argc < 3) || (argc > 4)) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Check for size specification. */ @@ -210,7 +210,7 @@ int do_mem_mdc ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong count;
if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
count = simple_strtoul(argv[3], NULL, 10);
@@ -237,7 +237,7 @@ int do_mem_mwc ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong count;
if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
count = simple_strtoul(argv[3], NULL, 10);
@@ -266,7 +266,7 @@ int do_mem_cmp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int rcode = 0;
if (argc != 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Check for size specification. */ @@ -352,7 +352,7 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int size;
if (argc != 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Check for size specification. */ @@ -478,7 +478,7 @@ int do_mem_loop (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) volatile u_char *cp;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Check for a size spefication. * Defaults to long if no or incorrect specification. @@ -547,7 +547,7 @@ int do_mem_loopw (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) volatile u_char *cp;
if (argc < 4) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Check for a size spefication. * Defaults to long if no or incorrect specification. @@ -979,7 +979,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[]) int nbytes, size;
if (argc != 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
#ifdef CONFIG_BOOT_RETRY_TIME reset_cmd_timeout(); /* got a good command to get here */ @@ -1084,7 +1084,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong *ptr;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
addr = simple_strtoul (argv[1], NULL, 16); addr += base_address; @@ -1118,7 +1118,7 @@ int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (argc < 3) { usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
av = argv + 1; diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index 00180b0..ddf80d7 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -38,13 +38,13 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) unsigned int blocking;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
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); + return CMD_RET_USAGE; }
switch (fslnum) { @@ -193,13 +193,13 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) unsigned int blocking;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
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); + return CMD_RET_USAGE;
switch (fslnum) { #if (XILINX_FSL_NUMBER > 0) @@ -347,7 +347,7 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) unsigned int val = 0;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
reg = (unsigned int)simple_strtoul (argv[1], NULL, 16); val = (unsigned int)simple_strtoul (argv[2], NULL, 16); diff --git a/common/cmd_mgdisk.c b/common/cmd_mgdisk.c index d99af2d..3bd2429 100644 --- a/common/cmd_mgdisk.c +++ b/common/cmd_mgdisk.c @@ -54,7 +54,7 @@ int do_mg_disk_cmd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } return 0; } diff --git a/common/cmd_mii.c b/common/cmd_mii.c index 23b723e..8df44cc 100644 --- a/common/cmd_mii.c +++ b/common/cmd_mii.c @@ -293,7 +293,7 @@ static int do_mii(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) const char *devname;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
#if defined(CONFIG_MII_INIT) mii_init (); @@ -420,7 +420,7 @@ static int do_mii(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else miiphy_set_current_dev (argv[2]); } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/* diff --git a/common/cmd_misc.c b/common/cmd_misc.c index 061b1bb..973b1c2 100644 --- a/common/cmd_misc.c +++ b/common/cmd_misc.c @@ -33,7 +33,7 @@ int do_sleep (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong delay;
if (argc != 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
delay = simple_strtoul(argv[1], NULL, 10) * CONFIG_SYS_HZ;
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 8f13c22..750509d 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -32,7 +32,7 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int dev;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (strcmp(argv[1], "init") == 0) { if (argc == 2) { @@ -43,7 +43,7 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } else if (argc == 3) { dev = (int)simple_strtoul(argv[2], NULL, 10); } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (mmc_legacy_init(dev) != 0) { @@ -68,12 +68,12 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif curr_device = dev; } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
printf("mmc%d is current device\n", curr_device); } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return 0; @@ -153,7 +153,7 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) enum mmc_state state;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (curr_device < 0) { if (get_mmc_num() > 0) @@ -216,7 +216,7 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } } else - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
mmc = find_mmc_device(dev); if (!mmc) { @@ -307,7 +307,7 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return (n == cnt) ? 0 : 1; }
- return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_mmc_spi.c b/common/cmd_mmc_spi.c index cfd0fb1..98cd788 100644 --- a/common/cmd_mmc_spi.c +++ b/common/cmd_mmc_spi.c @@ -78,8 +78,7 @@ static int do_mmc_spi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0;
usage: - cmd_usage(cmdtp); - return 1; + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_mp.c b/common/cmd_mp.c index b115b59..4b27be4 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -29,7 +29,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) unsigned long cpuid;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
cpuid = simple_strtoul(argv[1], NULL, 10); if (!is_core_valid(cpuid)) { @@ -46,17 +46,17 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else if (strncmp(argv[2], "disable", 7) == 0) return cpu_disable(cpuid); else - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
return 0; }
/* 4 or greater, make sure its release */ if (strncmp(argv[2], "release", 7) != 0) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (cpu_release(cpuid, argc - 3, argv + 3)) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
return 0; } diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index b7c833b..2268829 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -2035,7 +2035,7 @@ int do_mtdparts(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return spread_partitions(); #endif /* CONFIG_CMD_MTDPARTS_SPREAD */
- return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/***************************************************/ diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 3e2edb8..0aa8230 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -357,7 +357,7 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, int argc, char *const argv[]) return ret;
usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
#endif @@ -719,7 +719,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) #endif
usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( @@ -908,7 +908,7 @@ int do_nandboot(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) usage: #endif show_boot_progress(-53); - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
show_boot_progress(53); diff --git a/common/cmd_net.c b/common/cmd_net.c index f89a24b..8648888 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -228,7 +228,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc, #endif default: show_boot_progress (-80); - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
show_boot_progress (80); @@ -268,7 +268,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
NetPingIP = string_to_ip(argv[1]); if (NetPingIP == 0) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (NetLoop(PING) < 0) { printf("ping failed; host %s is not alive\n", argv[1]); @@ -374,7 +374,7 @@ U_BOOT_CMD( int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (argc == 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * We should check for a valid hostname: diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 5995354..46f7ab1 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -173,7 +173,7 @@ static int do_env_grep(cmd_tbl_t *cmdtp, int flag, int rcode = 1, arg = 1, idx;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
memset(matched, 0, env_htab.size / 8);
@@ -411,7 +411,7 @@ int setenv_addr(const char *varname, const void *addr) int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
return _do_env_set(flag, argc, argv); } @@ -435,7 +435,7 @@ int do_env_ask(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Check the syntax */ switch (argc) { case 1: - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
case 2: /* env_ask envname */ sprintf(message, "Please enter '%s':", argv[1]); @@ -493,7 +493,7 @@ int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *init_val;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* Set read buffer to initial value or empty sting */ init_val = getenv(argv[1]); @@ -631,7 +631,7 @@ static int do_env_default(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (argc != 2 || strcmp(argv[1], "-f") != 0) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
set_default_env("## Resetting to default environment\n"); return 0; @@ -730,14 +730,14 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, sep = '\n'; break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } } NXTARG: ; }
if (argc < 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
addr = (char *)simple_strtoul(argv[0], NULL, 16);
@@ -838,13 +838,13 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, del = 1; break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } } }
if (argc < 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (!fmt) printf("## Warning: defaulting to text format\n"); @@ -944,7 +944,7 @@ static int do_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) cmd_tbl_t *cp;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* drop initial "env" arg */ argc--; @@ -955,7 +955,7 @@ static int do_env(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (cp) return cp->cmd(cmdtp, flag, argc, argv);
- return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_onenand.c b/common/cmd_onenand.c index a27adaa..0f2e208 100644 --- a/common/cmd_onenand.c +++ b/common/cmd_onenand.c @@ -390,7 +390,7 @@ static int do_onenand_read(cmd_tbl_t * cmdtp, int flag, int argc, char * const a size_t retlen = 0;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
s = strchr(argv[0], '.'); if ((s != NULL) && (!strcmp(s, ".oob"))) @@ -417,7 +417,7 @@ static int do_onenand_write(cmd_tbl_t * cmdtp, int flag, int argc, char * const size_t retlen = 0;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (strncmp(argv[0] + 6, "yaffs", 5) == 0) withoob = 1; @@ -503,7 +503,7 @@ static int do_onenand_dump(cmd_tbl_t * cmdtp, int flag, int argc, char * const a char *s;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
s = strchr(argv[0], '.'); ofs = (int)simple_strtoul(argv[1], NULL, 16); @@ -525,7 +525,7 @@ static int do_onenand_markbad(cmd_tbl_t * cmdtp, int flag, int argc, char * cons argv += 2;
if (argc <= 0) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
while (argc > 0) { addr = simple_strtoul(*argv, NULL, 16); @@ -569,7 +569,7 @@ static int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[] cmd_tbl_t *c;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
mtd = &onenand_mtd;
@@ -582,7 +582,7 @@ static int do_onenand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[] if (c) return c->cmd(cmdtp, flag, argc, argv); else - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_otp.c b/common/cmd_otp.c index eb93eb2..6f93335 100644 --- a/common/cmd_otp.c +++ b/common/cmd_otp.c @@ -89,7 +89,7 @@ int do_otp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (argc < 4) { usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
prompt_user = false; diff --git a/common/cmd_pci.c b/common/cmd_pci.c index 1e477bc..a1fe519 100644 --- a/common/cmd_pci.c +++ b/common/cmd_pci.c @@ -480,7 +480,7 @@ int do_pci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1; usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/***************************************************/ diff --git a/common/cmd_portio.c b/common/cmd_portio.c index 4f2f499..eae8f07 100644 --- a/common/cmd_portio.c +++ b/common/cmd_portio.c @@ -44,7 +44,7 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) uint value = out_last_value;
if (argc != 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) { /* @@ -102,7 +102,7 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) uint size = in_last_size;
if (argc != 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) { /* diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 673ca61..f61caca 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -322,7 +322,7 @@ do_pxe_get(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int err;
if (argc != 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
pxefile_addr_str = from_env("pxefile_addr_r"); @@ -1312,7 +1312,7 @@ do_pxe_boot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } else if (argc == 2) { pxefile_addr_str = argv[1]; } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (strict_strtoul(pxefile_addr_str, 16, &pxefile_addr_r) < 0) { @@ -1344,7 +1344,7 @@ int do_pxe(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) cmd_tbl_t *cp;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* drop initial "pxe" arg */ argc--; @@ -1355,7 +1355,7 @@ int do_pxe(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (cp) return cp->cmd(cmdtp, flag, argc, argv);
- return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_reiser.c b/common/cmd_reiser.c index ced1d40..fbb9484 100644 --- a/common/cmd_reiser.c +++ b/common/cmd_reiser.c @@ -57,7 +57,7 @@ int do_reiserls (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int part_length;
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
dev = (int)simple_strtoul (argv[2], &ep, 16); dev_desc = get_dev(argv[1],dev); @@ -149,7 +149,7 @@ int do_reiserload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) break;
default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (!filename) { diff --git a/common/cmd_sata.c b/common/cmd_sata.c index f62c0cb..7b1703f 100644 --- a/common/cmd_sata.c +++ b/common/cmd_sata.c @@ -79,7 +79,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) switch (argc) { case 0: case 1: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; case 2: if (strncmp(argv[1],"inf", 3) == 0) { int i; @@ -116,7 +116,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } return rc; } - return cmd_usage(cmdtp); + return CMD_RET_USAGE; case 3: if (strncmp(argv[1], "dev", 3) == 0) { int dev = (int)simple_strtoul(argv[2], NULL, 10); @@ -147,7 +147,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } return rc; } - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
default: /* at least 4 args */ if (strcmp(argv[1], "read") == 0) { @@ -183,7 +183,7 @@ int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) n, (n == cnt) ? "OK" : "ERROR"); return (n == cnt) ? 0 : 1; } else { - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
return rc; diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index fa10751..d15b567 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -230,7 +230,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) boot_device = argv[2]; break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (!boot_device) { @@ -336,10 +336,11 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) 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;
- case 2: + case 2: if (strncmp(argv[1],"res",3) == 0) { printf("\nReset SCSI\n"); scsi_bus_reset(); @@ -384,7 +385,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("\nno SCSI devices available\n"); return 1; } - return cmd_usage(cmdtp); + return CMD_RET_USAGE; case 3: if (strncmp(argv[1],"dev",3) == 0) { int dev = (int)simple_strtoul(argv[2], NULL, 10); @@ -412,7 +413,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } return 1; } - return cmd_usage(cmdtp); + return CMD_RET_USAGE; default: /* at least 4 args */ if (strcmp(argv[1],"read") == 0) { @@ -427,7 +428,7 @@ int do_scsi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } } /* switch */ - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
/**************************************************************************************** diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c index 1ff1232..1b3edb7 100644 --- a/common/cmd_setexpr.c +++ b/common/cmd_setexpr.c @@ -58,7 +58,7 @@ int do_setexpr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* Validate arguments */ if ((argc != 5) || (strlen(argv[3]) != 1)) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
w = cmd_get_data_size(argv[0], 4);
diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 7225656..cbc6fc0 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -293,7 +293,7 @@ done: return ret;
usage: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
U_BOOT_CMD( diff --git a/common/cmd_sha1sum.c b/common/cmd_sha1sum.c index 2b2dd8b..2713a14 100644 --- a/common/cmd_sha1sum.c +++ b/common/cmd_sha1sum.c @@ -32,7 +32,7 @@ static int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) u8 output[20];
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
addr = simple_strtoul(argv[1], NULL, 16); len = simple_strtoul(argv[2], NULL, 16); diff --git a/common/cmd_strings.c b/common/cmd_strings.c index 2986324..41b1665 100644 --- a/common/cmd_strings.c +++ b/common/cmd_strings.c @@ -15,7 +15,7 @@ static char *start_addr, *last_addr; int do_strings(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (argc == 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) { start_addr = (char *)simple_strtoul(argv[1], NULL, 16); diff --git a/common/cmd_time.c b/common/cmd_time.c index c937ae4..6dbdbbf 100644 --- a/common/cmd_time.c +++ b/common/cmd_time.c @@ -38,7 +38,7 @@ static int run_command_and_time_it(int flag, int argc, char * const argv[], return 1; } if (argc > cmdtp->maxargs) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
/* * TODO(clchiou): get_timer_masked() is only defined in certain ARM @@ -77,7 +77,7 @@ static int do_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int retval = 0;
if (argc == 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
retval = run_command_and_time_it(0, argc - 1, argv + 1, &cycles); report_time(cycles); diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 8c1bc23..35b1d31 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -438,7 +438,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) int err = 0;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (mtdparts_init() != 0) { printf("Error initializing mtdparts!\n"); @@ -465,7 +465,7 @@ static int do_ubi(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) }
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
#ifdef CONFIG_CMD_UBIFS /* diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c index 3cd2d8f..7752123 100644 --- a/common/cmd_ubifs.c +++ b/common/cmd_ubifs.c @@ -53,7 +53,7 @@ int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int ret;
if (argc != 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
vol_name = argv[1]; debug("Using volume %s\n", vol_name); @@ -94,7 +94,7 @@ void cmd_ubifs_umount(void) int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { if (argc != 1) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if (ubifs_initialized == 0) { printf("No UBIFS volume mounted!\n"); @@ -141,18 +141,18 @@ int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) }
if (argc < 3) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
addr = simple_strtoul(argv[1], &endp, 16); if (endp == argv[1]) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
filename = argv[2];
if (argc == 4) { size = simple_strtoul(argv[3], &endp, 16); if (endp == argv[3]) - return cmd_usage(cmdtp); + return CMD_RET_USAGE; } debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
diff --git a/common/cmd_unzip.c b/common/cmd_unzip.c index 6483b92..43ed791 100644 --- a/common/cmd_unzip.c +++ b/common/cmd_unzip.c @@ -39,7 +39,7 @@ static int do_unzip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) dst = simple_strtoul(argv[2], NULL, 16); break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (gunzip((void *) dst, dst_len, (void *) src, &src_len) != 0) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 8c87265..cd57ce6 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -378,7 +378,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) boot_device = argv[2]; break; default: - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
if (!boot_device) { @@ -508,7 +508,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
if ((strncmp(argv[1], "reset", 5) == 0) || (strncmp(argv[1], "start", 5) == 0)) { @@ -693,7 +693,7 @@ int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } #endif /* CONFIG_USB_STORAGE */ - return cmd_usage(cmdtp); + return CMD_RET_USAGE; }
#ifdef CONFIG_USB_STORAGE diff --git a/common/main.c b/common/main.c index 6f247ce..09313a9 100644 --- a/common/main.c +++ b/common/main.c @@ -1364,7 +1364,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) int i;
if (argc < 2) - return cmd_usage(cmdtp); + return CMD_RET_USAGE;
for (i=1; i<argc; ++i) { char *arg;
Hi,
On Sat, Dec 10, 2011 at 10:43 AM, Simon Glass sjg@chromium.org wrote:
At present two parsers have similar code to execute commands. Also cmd_usage() is called all over the place. This series adds a single function which processes commands called cmd_process().
This new function understands return codes, and in particular CMD_RET_USAGE to indicate a usage error. So rather than calling cmd_usage() themselves, the command handlers can just return this error.
There appears to be a run_command2() which is used to run commands with the selected parser. This series changes this in two separate steps to just run_command(), and renames the old run_command() to builtin_run_command(). No one should call this outside main.c since if the hush parser is being used it is wrong to call it. The built-in parser code could move into a separate file perhaps in a future patch.
The overall series reduces code size on ARM by about 1KB on my ~160KB U-Boot text region when the hush parser is used, and around 60 bytes when it isn't.
As an aside the only user of parse_line() is fsl_ddr_interactive() which seems to have its own command line interface which operates before DRAM is set up. Do I have this right? Is there no way this could be done later from a normal U-Boot command?
(I have run this through MAKEALL and it seems clean)
Changes in v2:
- Fix minor errors one of which created a warning
- Squash i2c patch into the common/ patch
Simon Glass (9): Remove CMD_PXE's static on run_command() Rename run_command() to builtin_run_command() Rename run_command2() to run_command() Stop using builtin_run_command() Don't include standard parser if hush is used Create a single cmd_call() function to handle command execution Remove interleave of non-U-Boot code in hush Add cmd_process() to process commands in one place Convert cmd_usage() calls in common to use a return value
Does any of the maintainers feel inclined to pick up these patches? It still seems to rebase cleanly against master, so it might be ok as is, but happy to resend if needed.
Regards, Simon
arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 7 +-- board/esd/common/cmd_loadpci.c | 2 +- board/esd/du440/du440.c | 2 +- common/cmd_bedbug.c | 6 +- common/cmd_bmp.c | 6 +- common/cmd_boot.c | 2 +- common/cmd_bootm.c | 10 +--- common/cmd_cache.c | 4 +- common/cmd_dataflash_mmc_mux.c | 2 +- common/cmd_date.c | 3 +- common/cmd_dcr.c | 8 +- common/cmd_df.c | 2 +- common/cmd_eeprom.c | 2 +- common/cmd_ext2.c | 4 +- common/cmd_fdc.c | 2 +- common/cmd_fdos.c | 2 +- common/cmd_fdt.c | 14 ++-- common/cmd_fitupd.c | 2 +- common/cmd_flash.c | 14 ++-- common/cmd_fpga.c | 4 +- common/cmd_gpio.c | 2 +- common/cmd_i2c.c | 32 +++++----- common/cmd_ide.c | 10 ++-- common/cmd_irq.c | 2 +- common/cmd_itest.c | 2 +- common/cmd_led.c | 6 +- common/cmd_load.c | 2 +- common/cmd_log.c | 4 +- common/cmd_md5sum.c | 2 +- common/cmd_mdio.c | 2 +- common/cmd_mem.c | 22 ++++---- common/cmd_mfsl.c | 10 ++-- common/cmd_mgdisk.c | 2 +- common/cmd_mii.c | 4 +- common/cmd_misc.c | 2 +- common/cmd_mmc.c | 14 ++-- common/cmd_mmc_spi.c | 3 +- common/cmd_mp.c | 8 +- common/cmd_mtdparts.c | 2 +- common/cmd_nand.c | 6 +- common/cmd_net.c | 6 +- common/cmd_nvedit.c | 22 ++++---- common/cmd_onenand.c | 12 ++-- common/cmd_otp.c | 2 +- common/cmd_pci.c | 2 +- common/cmd_portio.c | 4 +- common/cmd_pxe.c | 10 ++-- common/cmd_reiser.c | 4 +- common/cmd_sata.c | 8 +- common/cmd_scsi.c | 15 +++-- common/cmd_setexpr.c | 2 +- common/cmd_sf.c | 2 +- common/cmd_sha1sum.c | 2 +- common/cmd_source.c | 2 +- common/cmd_strings.c | 2 +- common/cmd_time.c | 4 +- common/cmd_ubi.c | 4 +- common/cmd_ubifs.c | 10 ++-- common/cmd_unzip.c | 2 +- common/cmd_usb.c | 6 +- common/command.c | 60 ++++++++++++++++++++ common/hush.c | 73 +++++++----------------- common/main.c | 98 +++++++++++---------------------- include/command.h | 24 ++++++++ include/common.h | 5 +- 65 files changed, 311 insertions(+), 305 deletions(-)
-- 1.7.3.1
Hi Simon,
On Thursday 12 January 2012 05:37:00 Simon Glass wrote:
Hi,
On Sat, Dec 10, 2011 at 10:43 AM, Simon Glass sjg@chromium.org wrote:
At present two parsers have similar code to execute commands. Also cmd_usage() is called all over the place. This series adds a single function which processes commands called cmd_process().
This new function understands return codes, and in particular CMD_RET_USAGE to indicate a usage error. So rather than calling cmd_usage() themselves, the command handlers can just return this error.
There appears to be a run_command2() which is used to run commands with the selected parser. This series changes this in two separate steps to just run_command(), and renames the old run_command() to builtin_run_command(). No one should call this outside main.c since if the hush parser is being used it is wrong to call it. The built-in parser code could move into a separate file perhaps in a future patch.
The overall series reduces code size on ARM by about 1KB on my ~160KB U-Boot text region when the hush parser is used, and around 60 bytes when it isn't.
As an aside the only user of parse_line() is fsl_ddr_interactive() which seems to have its own command line interface which operates before DRAM is set up. Do I have this right? Is there no way this could be done later from a normal U-Boot command?
(I have run this through MAKEALL and it seems clean)
Changes in v2:
- Fix minor errors one of which created a warning
- Squash i2c patch into the common/ patch
Simon Glass (9): Remove CMD_PXE's static on run_command() Rename run_command() to builtin_run_command() Rename run_command2() to run_command() Stop using builtin_run_command() Don't include standard parser if hush is used Create a single cmd_call() function to handle command execution Remove interleave of non-U-Boot code in hush Add cmd_process() to process commands in one place Convert cmd_usage() calls in common to use a return value
Does any of the maintainers feel inclined to pick up these patches? It still seems to rebase cleanly against master, so it might be ok as is, but happy to resend if needed.
Looking into it right now. Stay tuned...
Best regards, Stefan
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
On Saturday 10 December 2011 19:43:52 Simon Glass wrote:
At present two parsers have similar code to execute commands. Also cmd_usage() is called all over the place. This series adds a single function which processes commands called cmd_process().
This new function understands return codes, and in particular CMD_RET_USAGE to indicate a usage error. So rather than calling cmd_usage() themselves, the command handlers can just return this error.
There appears to be a run_command2() which is used to run commands with the selected parser. This series changes this in two separate steps to just run_command(), and renames the old run_command() to builtin_run_command(). No one should call this outside main.c since if the hush parser is being used it is wrong to call it. The built-in parser code could move into a separate file perhaps in a future patch.
The overall series reduces code size on ARM by about 1KB on my ~160KB U-Boot text region when the hush parser is used, and around 60 bytes when it isn't.
As an aside the only user of parse_line() is fsl_ddr_interactive() which seems to have its own command line interface which operates before DRAM is set up. Do I have this right? Is there no way this could be done later from a normal U-Boot command?
Whole series:
Applied to u-boot-staging/sr@denx.de. Thanks.
Best regards, Stefan
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
Hi Stefan,
On Wed, Jan 11, 2012 at 11:43 PM, Stefan Roese sr@denx.de wrote:
On Saturday 10 December 2011 19:43:52 Simon Glass wrote:
At present two parsers have similar code to execute commands. Also cmd_usage() is called all over the place. This series adds a single function which processes commands called cmd_process().
This new function understands return codes, and in particular CMD_RET_USAGE to indicate a usage error. So rather than calling cmd_usage() themselves, the command handlers can just return this error.
There appears to be a run_command2() which is used to run commands with the selected parser. This series changes this in two separate steps to just run_command(), and renames the old run_command() to builtin_run_command(). No one should call this outside main.c since if the hush parser is being used it is wrong to call it. The built-in parser code could move into a separate file perhaps in a future patch.
The overall series reduces code size on ARM by about 1KB on my ~160KB U-Boot text region when the hush parser is used, and around 60 bytes when it isn't.
As an aside the only user of parse_line() is fsl_ddr_interactive() which seems to have its own command line interface which operates before DRAM is set up. Do I have this right? Is there no way this could be done later from a normal U-Boot command?
Whole series:
Applied to u-boot-staging/sr@denx.de. Thanks.
Thanks for your efforts with this, sorry about the return code problem. I have re-done the series keeping the original return code behaviour - let's wait and see what people think of that.
Regards, Simon
Best regards, Stefan
-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
participants (3)
-
Simon Glass -
Stefan Roese -
Wolfgang Denk