From 40b44047fee05d23607a9fbc600cb5a8fd384b89 Mon Sep 17 00:00:00 2001 From: Lee Campbell Date: Wed, 15 Jun 2016 10:53:42 -0700 Subject: Fix offset to slot_suffix slot_suffix has moved outside of bootloader_message. Fixed up the offset which is now in bootloader_message_ab BUG:29371681 Change-Id: Id90a1aa777dc9289dc5ba37655144e6d22ad3f2f --- soc/common/boot_control/bootinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soc/common/boot_control/bootinfo.c b/soc/common/boot_control/bootinfo.c index 8f5b214..6209a65 100644 --- a/soc/common/boot_control/bootinfo.c +++ b/soc/common/boot_control/bootinfo.c @@ -83,12 +83,12 @@ static int boot_info_open_misc(int flags) return fd; } -// As per struct bootloader_message which is defined in +// As per struct bootloader_message_ab which is defined in // bootable/recovery/bootloader.h we can use the 32 bytes in the // bootctrl_suffix field provided that they start with the active slot // suffix terminated by NUL. It just so happens that BrilloBootInfo is // laid out this way. -#define BOOTINFO_OFFSET offsetof(struct bootloader_message, slot_suffix) +#define BOOTINFO_OFFSET offsetof(struct bootloader_message_ab, slot_suffix) bool boot_info_load(BrilloBootInfo *out_info) { -- cgit v1.2.3