commit f5e2831bf32fe1c0069c3c7bbeda876dbb83fe0a
author Jeremy Compostella <jeremy.compostella@intel.com> Mon May 23 21:22:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 21:22:07 2016 +0000
tree c1d319877e80f1b421de63de3687ef2d9b95645a
parent 84478e88234b68e457e18877ba9542029e5c7865
parent 1ae2434c117a3cd0b504e3f3ad24730577836a69

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

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

Change-Id: I8c7bca4f0bb41268904d09309ef1b94215c24bc8

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