Add IBootControl 1.1 support to libboot_control.

Bug: 138861550 Test: vts Change-Id: Id4a2963d6ab657d8ab076b7013492a691462b287
2019-08-29 15:09:22 -07:00
parent b18f153b12
commit 46f38e4610
4 changed files with 33 additions and 1 deletions
@@ -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.