diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-12-30 13:04:09 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-12-30 13:04:38 +0100 |
| commit | 4e0114d9679173cfe8bfaffb8b4fb4bbf8cdaa10 (patch) | |
| tree | 2a909fd0434753a0e5b252afcda5aeb23f21ac26 /common/hash.c | |
| parent | 7ae350a0305de592faa8903255c988d4e6afb194 (diff) | |
| parent | 125738e819a3b9d15210794b3dcef9f4d9bcf866 (diff) | |
| download | u-boot-imx-4e0114d9679173cfe8bfaffb8b4fb4bbf8cdaa10.zip u-boot-imx-4e0114d9679173cfe8bfaffb8b4fb4bbf8cdaa10.tar.gz u-boot-imx-4e0114d9679173cfe8bfaffb8b4fb4bbf8cdaa10.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'common/hash.c')
| -rw-r--r-- | common/hash.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/common/hash.c b/common/hash.c index 12d6759..aceabc5 100644 --- a/common/hash.c +++ b/common/hash.c @@ -256,7 +256,7 @@ static int parse_verify_sum(struct hash_algo *algo, char *verify_str, env_var = 1; } - if (env_var) { + if (!env_var) { ulong addr; void *buf; @@ -347,7 +347,7 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, { ulong addr, len; - if (argc < 2) + if ((argc < 2) || ((flags & HASH_FLAG_VERIFY) && (argc < 3))) return CMD_RET_USAGE; addr = simple_strtoul(*argv++, NULL, 16); @@ -380,8 +380,6 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, #else if (0) { #endif - if (!argc) - return CMD_RET_USAGE; if (parse_verify_sum(algo, *argv, vsum, flags & HASH_FLAG_ENV)) { printf("ERROR: %s does not contain a valid " |