aboutsummaryrefslogtreecommitdiff
path: root/bootloader_message
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2019-08-29 15:09:22 -0700
committerDavid Anderson <dvander@google.com>2019-09-04 18:12:36 -0700
commit46f38e461042d5f84baee32250fd15e56301a134 (patch)
treed30db11856481383f770399602a4b575227e07ec /bootloader_message
parentb18f153b12eedad79a609be96cce69d5b137f844 (diff)
Add IBootControl 1.1 support to libboot_control.
Bug: 138861550 Test: vts Change-Id: Id4a2963d6ab657d8ab076b7013492a691462b287
Diffstat (limited to 'bootloader_message')
-rw-r--r--bootloader_message/include/bootloader_message/bootloader_message.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h
index 5c0a450f..b7878308 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.