diff options
| author | Tom Rini <trini@konsulko.com> | 2024-02-13 17:31:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-02-13 17:32:17 -0500 |
| commit | 0b66c54a97320956b837f61216debfb50c0ffec6 (patch) | |
| tree | 4a641d6853dd8dd7fd7586b6be8d67c418717204 /cmd/hash.c | |
| parent | 73b5b47dd5b546d0b9106bcca54c72815380e6d3 (diff) | |
| parent | ea7d3eec1e6e6541db68bf48a1314410e06cd9de (diff) | |
Merge branch '2024-02-13-assorted-updates'
- Add the button command patch, update MAINTAINERS entry for a platform,
fix a problem with the hash command, fix a problem on K3 platforms and
revert a change on verdin-am62.
Diffstat (limited to 'cmd/hash.c')
| -rw-r--r-- | cmd/hash.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/cmd/hash.c b/cmd/hash.c index e163cd6774..5534a735fa 100644 --- a/cmd/hash.c +++ b/cmd/hash.c @@ -14,15 +14,22 @@ #include <hash.h> #include <linux/ctype.h> +#if IS_ENABLED(CONFIG_HASH_VERIFY) +#define HARGS 6 +#else +#define HARGS 5 +#endif + static int do_hash(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { char *s; int flags = HASH_FLAG_ENV; -#ifdef CONFIG_HASH_VERIFY - if (argc < 4) + if (argc < (HARGS - 1)) return CMD_RET_USAGE; + +#if IS_ENABLED(CONFIG_HASH_VERIFY) if (!strcmp(argv[1], "-v")) { flags |= HASH_FLAG_VERIFY; argc--; @@ -37,18 +44,12 @@ static int do_hash(struct cmd_tbl *cmdtp, int flag, int argc, return hash_command(*argv, flags, cmdtp, flag, argc - 1, argv + 1); } -#ifdef CONFIG_HASH_VERIFY -#define HARGS 6 -#else -#define HARGS 5 -#endif - U_BOOT_CMD( hash, HARGS, 1, do_hash, "compute hash message digest", "algorithm address count [[*]hash_dest]\n" " - compute message digest [save to env var / *address]" -#ifdef CONFIG_HASH_VERIFY +#if IS_ENABLED(CONFIG_HASH_VERIFY) "\nhash -v algorithm address count [*]hash\n" " - verify message digest of memory area to immediate value, \n" " env var or *address" |