summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Campbell <leecam@google.com>2016-06-15 10:53:42 -0700
committerLee Campbell <leecam@google.com>2016-06-15 10:53:42 -0700
commit40b44047fee05d23607a9fbc600cb5a8fd384b89 (patch)
tree691435ef8b04a82fca33f087d8dc7affb9ed2115
parentefaad867f6f7e7b813312666358a2d8c0743fcff (diff)
downloadmarvell-40b44047fee05d23607a9fbc600cb5a8fd384b89.tar.gz
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
-rw-r--r--soc/common/boot_control/bootinfo.c4
1 files 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)
{