From 46f38e461042d5f84baee32250fd15e56301a134 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 29 Aug 2019 15:09:22 -0700 Subject: Add IBootControl 1.1 support to libboot_control. Bug: 138861550 Test: vts Change-Id: Id4a2963d6ab657d8ab076b7013492a691462b287 --- bootloader_message/include/bootloader_message/bootloader_message.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bootloader_message/include') diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index 5c0a450fc..b78783083 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -163,8 +163,10 @@ struct bootloader_control { uint8_t nb_slot : 3; // Number of times left attempting to boot recovery. uint8_t recovery_tries_remaining : 3; + // Status of any pending snapshot merge of dynamic partitions. + uint8_t merge_status : 3; // Ensure 4-bytes alignment for slot_info field. - uint8_t reserved0[2]; + uint8_t reserved0[1]; // Per-slot information. Up to 4 slots. struct slot_metadata slot_info[4]; // Reserved for further use. -- cgit v1.2.3