diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-29 17:53:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-29 18:00:21 -0400 |
| commit | 1057b1be75386e3513dca392d8258e01e5cccc01 (patch) | |
| tree | a1cbdc677c070064177e1d9defeb1fb4ab30ad6e /common | |
| parent | 4906238191b90be7aec2269ba8cd6aeb161cd312 (diff) | |
| parent | d8eafb16c85bc3b5d85d7ba8ebb1438cc0ae168f (diff) | |
| download | u-boot-1057b1be75386e3513dca392d8258e01e5cccc01.tar.gz u-boot-1057b1be75386e3513dca392d8258e01e5cccc01.tar.xz u-boot-1057b1be75386e3513dca392d8258e01e5cccc01.zip | |
Merge tag 'v2021.04-rc5' into next
Prepare v2021.04-rc5
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 2d0ece6181..b972042f43 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1655,7 +1655,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; } } |