summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@chromium.org>2012-10-31 17:19:44 -0600
committerGerrit <chrome-bot@google.com>2012-11-06 11:40:28 -0800
commit9754cae1c1c4b267f228ee65df410e4115dc3d17 (patch)
tree0f7a03c2bc61574763adbabdeb38fe9009aa36f0
parent3f9857420f9fea0a27a3190cf0079a200460921d (diff)
downloadvboot-9754cae1c1c4b267f228ee65df410e4115dc3d17.tar.gz
Add FAFT keyboard remap GBB flag
Add a new flag, 0x100, to indicate FAFT key stroke overrides. BUG=chrome-os-partner:14056 TEST=none BRANCH=stout Change-Id: I76b7f3f4c51abec5528047f690f20a09b257abc2 Signed-off-by: Marc Jones <marc.jones@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/37074 Reviewed-by: Ronald G. Minnich <rminnich@chromium.org> Reviewed-by: Gediminas Ramanauskas <gedis@chromium.org> Tested-by: Gediminas Ramanauskas <gedis@chromium.org> Commit-Ready: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--firmware/include/gbb_header.h3
-rwxr-xr-xscripts/image_signing/set_gbb_flags.sh1
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/include/gbb_header.h b/firmware/include/gbb_header.h
index 5031eeb3..f490bb01 100644
--- a/firmware/include/gbb_header.h
+++ b/firmware/include/gbb_header.h
@@ -53,7 +53,8 @@
#define GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040
/* Allow booting Legacy OSes in dev mode even if dev_boot_legacy=0. */
#define GBB_FLAG_FORCE_DEV_BOOT_LEGACY 0x00000080
-
+/* Allow booting using alternate keys for FAFT servo testing */
+#define GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100
#ifdef __cplusplus
extern "C" {
diff --git a/scripts/image_signing/set_gbb_flags.sh b/scripts/image_signing/set_gbb_flags.sh
index de17c83d..ac52432d 100755
--- a/scripts/image_signing/set_gbb_flags.sh
+++ b/scripts/image_signing/set_gbb_flags.sh
@@ -30,6 +30,7 @@ GBBFLAGS_DESCRIPTION="
GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020
GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040
GBB_FLAG_FORCE_DEV_BOOT_LEGACY 0x00000080
+ GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100
To get a developer-friendly device, try 0x11 (short_delay + boot_usb).
For factory-related tests (always DEV), try 0x39.