forked from OERV-BSP/u-boot
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
This commit is contained in:
+1
-2
@@ -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;
|
||||
}
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user