diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-10 07:51:40 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-10 07:51:40 -0600 |
| commit | ce1a2630827a1f9ddadb2598ab7936732e6cb723 (patch) | |
| tree | f470da34de08daa94e5fface0235125123e16132 | |
| parent | 40727391702a1a48c58b0a3c6e69013ff8af6cb2 (diff) | |
| parent | cc2f60c13f6aaf1bd277cf10c8b375c2e4a695b7 (diff) | |
Merge tag 'u-boot-dfu-20240910' of https://source.denx.de/u-boot/custodians/u-boot-dfu
CI: https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/22302
- Fix ANDROID_AB_BACKUP_OFFSET unit
| -rw-r--r-- | boot/android_ab.c | 9 | ||||
| -rw-r--r-- | common/Kconfig | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index 143f373aae9..1196a189ed5 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -139,8 +139,13 @@ static int ab_control_store(struct blk_desc *dev_desc, { ulong abc_offset, abc_blocks, ret; - abc_offset = offset + - offsetof(struct bootloader_message_ab, slot_suffix) / + if (offset % part_info->blksz) { + log_err("ANDROID: offset not block aligned\n"); + return -EINVAL; + } + + abc_offset = (offset + + offsetof(struct bootloader_message_ab, slot_suffix)) / part_info->blksz; abc_blocks = DIV_ROUND_UP(sizeof(struct bootloader_control), part_info->blksz); diff --git a/common/Kconfig b/common/Kconfig index 83c81edac20..e1b8557e0cb 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -986,7 +986,8 @@ config ANDROID_AB_BACKUP_OFFSET help If non-zero, a backup bootloader message starting at this offset in the partition will tried in the event that the primary one (starting - at offset 0) fails its checksum. + at offset 0) fails its checksum. The offset is in bytes and must be + multiple of the block size. endmenu |