Merge tag 'v2024.10-rc5' into next

Prepare v2024.10-rc5
This commit is contained in:
Tom Rini
2024-09-16 14:48:13 -06:00
34 changed files with 240 additions and 132 deletions

View File

@@ -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);