diff options
| author | Tom Rini <trini@konsulko.com> | 2025-07-16 08:41:40 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-07-16 10:56:28 -0600 |
| commit | a76a8437926c287c6ebefeaf6a1bb7f8bf088761 (patch) | |
| tree | 84c45b931b27bce263db3dd721add114049e1810 | |
| parent | bcc7bc69b92ab728790aea0d08b2ae5e22d3b09d (diff) | |
| parent | 89911825a2d3bbd1bc5d41b977aa24fb5b10f49d (diff) | |
Merge tag 'u-boot-dfu-20250716' of https://source.denx.de/u-boot/custodians/u-boot-dfu
u-boot-dfu-20250716
Android:
- Fix printing lbaint_t format in AVB and android_ab messages
DFU:
- Fix dfu_config_interfaces() for single interface DFU syntax
| -rw-r--r-- | boot/android_ab.c | 3 | ||||
| -rw-r--r-- | common/avb_verify.c | 4 | ||||
| -rw-r--r-- | drivers/dfu/dfu.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index a287eac04fe..13e82dbcb7f 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -101,8 +101,7 @@ static int ab_control_create_from_disk(struct blk_desc *dev_desc, abc_blocks = DIV_ROUND_UP(sizeof(struct bootloader_control), part_info->blksz); if (abc_offset + abc_blocks > part_info->size) { - log_err("ANDROID: boot control partition too small. Need at"); - log_err(" least %lu blocks but have %lu blocks.\n", + log_err("ANDROID: boot control partition too small. Need at least %lu blocks but have " LBAF " blocks.\n", abc_offset + abc_blocks, part_info->size); return -EINVAL; } diff --git a/common/avb_verify.c b/common/avb_verify.c index cff9117d92f..29a3272579c 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -320,7 +320,7 @@ static unsigned long mmc_read_and_flush(struct mmc_part *part, } if ((start + sectors) > (part->info.start + part->info.size)) { sectors = part->info.start + part->info.size - start; - printf("%s: read sector aligned to partition bounds (%ld)\n", + printf("%s: read sector aligned to partition bounds (" LBAF ")\n", __func__, sectors); } @@ -363,7 +363,7 @@ static unsigned long mmc_write(struct mmc_part *part, lbaint_t start, } if ((start + sectors) > (part->info.start + part->info.size)) { sectors = part->info.start + part->info.size - start; - printf("%s: sector aligned to partition bounds (%ld)\n", + printf("%s: sector aligned to partition bounds (" LBAF ")\n", __func__, sectors); } if (unaligned) { diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 756569217bb..eefdf44ec87 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -147,7 +147,7 @@ int dfu_config_interfaces(char *env) break; a = strsep(&s, "&"); if (!a) - a = s; + a = d; do { part = strsep(&a, ";"); part = skip_spaces(part); |