summaryrefslogtreecommitdiffstats
path: root/bootloader_message
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2019-08-30 00:09:22 +0200
committerDavid Anderson <dvander@google.com>2019-09-05 03:12:36 +0200
commit46f38e461042d5f84baee32250fd15e56301a134 (patch)
treed30db11856481383f770399602a4b575227e07ec /bootloader_message
parentImprove error messaging when bootcontrol HAL fails to load. (diff)
downloadandroid_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.tar
android_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.tar.gz
android_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.tar.bz2
android_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.tar.lz
android_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.tar.xz
android_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.tar.zst
android_bootable_recovery-46f38e461042d5f84baee32250fd15e56301a134.zip
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 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.