diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-29 11:51:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-29 11:51:17 -0400 |
| commit | 2d64a0f7e952f54375702fb2b854461e402ded9d (patch) | |
| tree | 591a1592b29de743bb52895ebb098ebc8b00f57a /cmd | |
| parent | 92430b8fc8aac3b4ab92e9ca8a09d83c4788c609 (diff) | |
| parent | f043dc28e3cce115089fb9ab86bc6f4bc4a8a882 (diff) | |
Merge branch '2019-07-29-master-imports'
- Assorted bug fixes
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/cache.c | 8 | ||||
| -rw-r--r-- | cmd/help.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cmd/cache.c b/cmd/cache.c index 233f428054e..2c687173a8b 100644 --- a/cmd/cache.c +++ b/cmd/cache.c @@ -22,7 +22,7 @@ void __weak invalidate_icache_all(void) static int do_icache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { switch (argc) { - case 2: /* on / off */ + case 2: /* on / off / flush */ switch (parse_argv(argv[1])) { case 0: icache_disable(); @@ -33,6 +33,8 @@ static int do_icache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) case 2: invalidate_icache_all(); break; + default: + return CMD_RET_USAGE; } break; case 1: /* get status */ @@ -54,7 +56,7 @@ void __weak flush_dcache_all(void) static int do_dcache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { switch (argc) { - case 2: /* on / off */ + case 2: /* on / off / flush */ switch (parse_argv(argv[1])) { case 0: dcache_disable(); @@ -65,6 +67,8 @@ static int do_dcache(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) case 2: flush_dcache_all(); break; + default: + return CMD_RET_USAGE; } break; case 1: /* get status */ diff --git a/cmd/help.c b/cmd/help.c index fa2010c67eb..a1a0b99b6ff 100644 --- a/cmd/help.c +++ b/cmd/help.c @@ -27,6 +27,7 @@ U_BOOT_CMD( " - print detailed usage of 'command'" ); +#ifdef CONFIG_CMDLINE /* This does not use the U_BOOT_CMD macro as ? can't be used in symbol names */ ll_entry_declare(cmd_tbl_t, question_mark, cmd) = { "?", CONFIG_SYS_MAXARGS, cmd_always_repeatable, do_help, @@ -35,3 +36,4 @@ ll_entry_declare(cmd_tbl_t, question_mark, cmd) = { "" #endif /* CONFIG_SYS_LONGHELP */ }; +#endif |