commit be04a5efa269c2746ad7d7df5bb81350f2f6096f
author Jeremy Compostella <jeremy.compostella@intel.com> Tue May 24 01:19:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 24 01:19:36 2016 +0000
tree 65237ca8c8583486b6bb5582eeba71e1509294c8
parent 9bedd1a003945ec9cb1f1c8e3278588c7e7570b8
parent 1afd591a09cee35d0cafac3c1d7f236fe28cf274

Merge "slot_metadata: add verity_corrupted field" am: 3788001b2c am: 1ae2434c11 am: f5e2831bf3
am: 1afd591a09

* commit '1afd591a09cee35d0cafac3c1d7f236fe28cf274':
  slot_metadata: add verity_corrupted field

Change-Id: Ic61d0514a8f224f35fe172b1056c6adb8bbc253c

bootloader.h

diff --git a/bootloader.h b/bootloader.h
index 92c74f0..de53518 100644
--- a/bootloader.h
+++ b/bootloader.h
@@ -74,8 +74,11 @@
     uint8_t tries_remaining : 3;
     // 1 if this slot has booted successfully, 0 otherwise.
     uint8_t successful_boot : 1;
+    // 1 if this slot is corrupted from a dm-verity corruption, 0
+    // otherwise.
+    uint8_t verity_corrupted : 1;
     // Reserved for further use.
-    uint8_t reserved;
+    uint8_t reserved : 7;
 } __attribute__((packed));
 
 /* Bootloader Control AB