| commit | 0779890e66b49da936354c2e1570854b3605e53f | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Thu Jul 27 20:50:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 27 20:50:12 2023 +0000 |
| tree | 1c3a934c03a629a843bc34c6c784f662c42e0103 | |
| parent | 6656944ffd47f4d0a851b2b23038ca1b7762a296 [diff] | |
| parent | 4f699295cb5905fe24faad4a8e04e563bfe075ed [diff] |
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc8ec87f31 -s ours am: 4f699295cb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/24213244 Change-Id: Idc7e0c1617bbe6bc50b88664126b7c760c8bd905 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index 8fba101..8d0c132 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h
@@ -110,6 +110,11 @@ #define MISC_MEMTAG_MODE_MEMTAG_KERNEL 0x4 #define MISC_MEMTAG_MODE_MEMTAG_KERNEL_ONCE 0x8 #define MISC_MEMTAG_MODE_MEMTAG_OFF 0x10 +// This is set when the state was overridden forcibly. This does not need to be +// interpreted by the bootloader but is only for bookkeeping purposes so +// userspace knows what to do when the override is undone. +// See system/extras/mtectrl in AOSP for more information. +#define MISC_MEMTAG_MODE_FORCED 0x20 #if (__STDC_VERSION__ >= 201112L) || defined(__cplusplus) static_assert(sizeof(struct misc_virtual_ab_message) == 64,