diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-18 12:53:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-18 12:53:35 -0400 |
| commit | d65bd5707324b11b4cf95c47b482252d3ea803a4 (patch) | |
| tree | f0711e70e00a1eaacdcc135ace17a61ab469cbd1 /common | |
| parent | eed127dbd4082ba21fd420449e68d1ad177cdc4b (diff) | |
| parent | 9262fe15599a388e365cca3091e4852be8f23f11 (diff) | |
Merge branch '2021-03-17-assorted-fixes'
- Make tests search /sbin for tools, don't use ENODATA in host tools to
be more portable, avb fix when partition isn't found and a bugfix for
mediatek mmc.
Diffstat (limited to 'common')
| -rw-r--r-- | common/avb_verify.c | 2 | ||||
| -rw-r--r-- | common/image-fit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/avb_verify.c b/common/avb_verify.c index db10d0f21f..0520a71455 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -369,7 +369,7 @@ static struct mmc_part *get_partition(AvbOps *ops, const char *partition) } ret = part_get_info_by_name(mmc_blk, partition, &part->info); - if (!ret) { + if (ret < 0) { printf("Can't find partition '%s'\n", partition); goto err; } diff --git a/common/image-fit.c b/common/image-fit.c index 28b3d2b191..94501b1071 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1651,7 +1651,7 @@ int fit_check_format(const void *fit, ulong size) /* mandatory / node 'timestamp' property */ if (!fdt_getprop(fit, 0, FIT_TIMESTAMP_PROP, NULL)) { log_debug("Wrong FIT format: no timestamp\n"); - return -ENODATA; + return -EBADMSG; } } |