summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/2lib/include/2gbb_flags.h10
-rwxr-xr-xscripts/image_signing/gbb_flags_common.sh2
2 files changed, 9 insertions, 3 deletions
diff --git a/firmware/2lib/include/2gbb_flags.h b/firmware/2lib/include/2gbb_flags.h
index 1bca85fb..cd605d8d 100644
--- a/firmware/2lib/include/2gbb_flags.h
+++ b/firmware/2lib/include/2gbb_flags.h
@@ -53,8 +53,14 @@ enum vb2_gbb_flag {
/* Allow booting Legacy OSes in dev mode even if dev_boot_legacy=0. */
VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY = 1 << 7,
- /* Allow booting using alternate keys for FAFT servo testing */
- VB2_GBB_FLAG_FAFT_KEY_OVERIDE = 1 << 8,
+ /*
+ * Currently running FAFT tests. May be used as a hint to disable
+ * other debug features which may interfere with tests. However, this
+ * should never be used to modify Chrome OS behaviour on specific
+ * devices with the goal of passing a test. See chromium:965914 for
+ * more information.
+ */
+ VB2_GBB_FLAG_RUNNING_FAFT = 1 << 8,
/* Disable EC software sync */
VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC = 1 << 9,
diff --git a/scripts/image_signing/gbb_flags_common.sh b/scripts/image_signing/gbb_flags_common.sh
index 62429a57..100f37d1 100755
--- a/scripts/image_signing/gbb_flags_common.sh
+++ b/scripts/image_signing/gbb_flags_common.sh
@@ -27,7 +27,7 @@ GBBFLAGS_LIST="
VB2_GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020
VB2_GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040
VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY 0x00000080
- VB2_GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100
+ VB2_GBB_FLAG_RUNNING_FAFT 0x00000100
VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC 0x00000200
VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY 0x00000400
VB2_GBB_FLAG_DISABLE_AUXFW_SOFTWARE_SYNC 0x00000800