summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@chromium.org>2012-10-31 17:19:44 -0600
committerShawn Nematbakhsh <shawnn@google.com>2012-12-13 11:26:26 -0800
commit2c62ea0d997162fcda717da184b6fa64171a66d6 (patch)
treeff3f25df982f0be16db1b58d142392c9ea283678
parentd5071c1c30e8a3e30987ee600d8ae0f194ec27ea (diff)
downloadvboot-firmware-stout-2817.B.tar.gz
STOUT-FIRMWARE: Add FAFT keyboard remap GBB flagfirmware-stout-2817.B
Add a new flag, 0x100, to indicate FAFT key stroke overrides. BUG=chrome-os-partner:16799 TEST=manual BRANCH=stout Change-Id: Ibf9a24842619da644a3fefdd8a77c6a51ec45db1 Original-Change-Id: I76b7f3f4c51abec5528047f690f20a09b257abc2 Signed-off-by: Marc Jones <marc.jones@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/39651 Reviewed-by: Shawn Nematbakhsh <shawnn@google.com> Tested-by: Shawn Nematbakhsh <shawnn@google.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 57fb7011..22948bec 100644
--- a/firmware/include/gbb_header.h
+++ b/firmware/include/gbb_header.h
@@ -51,7 +51,8 @@
#define GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020
/* Allow Enter key to trigger dev->tonorm screen transition */
#define GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040
-
+/* 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 47f36917..e2caf2ed 100755
--- a/scripts/image_signing/set_gbb_flags.sh
+++ b/scripts/image_signing/set_gbb_flags.sh
@@ -29,6 +29,7 @@ GBBFLAGS_DESCRIPTION="
GBB_FLAG_FORCE_DEV_BOOT_USB 0x00000010
GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020
GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040
+ 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.