diff options
| author | Marc Jones <marc.jones@chromium.org> | 2012-10-31 17:19:44 -0600 |
|---|---|---|
| committer | Gediminas Ramanauskas <gedis@chromium.org> | 2012-12-10 14:45:49 -0800 |
| commit | 28db236ba478228c892b73e4efd7dc2142047e0a (patch) | |
| tree | 3b450b973ea9387bc0bb452da111df39cc386861 | |
| parent | 5035fba257cb6864b26f6575ad89372b4c777525 (diff) | |
| download | vboot-28db236ba478228c892b73e4efd7dc2142047e0a.tar.gz | |
(firmware-parrot) Add FAFT keyboard remap GBB flag
Add a new flag, 0x100, to indicate FAFT key stroke overrides.
BUG=chrome-os-partner:14056
TEST=none
Change-Id: Icbab3d6b4d3ba8a64e74f3733c2acc76f12668f3
Original-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>
Reviewed-on: https://gerrit.chromium.org/gerrit/39258
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
| -rw-r--r-- | firmware/include/gbb_header.h | 7 | ||||
| -rwxr-xr-x | scripts/image_signing/set_gbb_flags.sh | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/firmware/include/gbb_header.h b/firmware/include/gbb_header.h index 57fb7011..691896ab 100644 --- a/firmware/include/gbb_header.h +++ b/firmware/include/gbb_header.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -51,7 +51,10 @@ #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 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 bb23149a..ac52432d 100755 --- a/scripts/image_signing/set_gbb_flags.sh +++ b/scripts/image_signing/set_gbb_flags.sh @@ -28,6 +28,9 @@ GBBFLAGS_DESCRIPTION=" GBB_FLAG_FORCE_DEV_SWITCH_ON 0x00000008 GBB_FLAG_FORCE_DEV_BOOT_USB 0x00000010 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. |