diff options
| author | Furquan Shaikh <furquan@google.com> | 2015-05-15 00:44:41 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-05-16 04:17:21 +0000 |
| commit | 138bb3c004154f67f3b37aafef3a6efa8bf0b338 (patch) | |
| tree | c67f7fa0e11061126681eadd743ea69ed165532d | |
| parent | 9101df2fe3ed4f0e8b65121ffc1c7e8b2d65b35d (diff) | |
| download | vboot-138bb3c004154f67f3b37aafef3a6efa8bf0b338.tar.gz | |
GBB: Add flag for forcing full fastboot capability in firmware
This flag is equivalent to FORCE_DEV_BOOT_USB. It allows full fastboot
capability in firmware for developer mode.
BUG=chrome-os-partner:40196
BRANCH=None
TEST=Compiles successfully for smaug.
Change-Id: I82a2ebe7a8b3bbf38694ab81ca2678624f77fca1
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/271410
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Trybot-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | firmware/2lib/include/2struct.h | 6 | ||||
| -rw-r--r-- | firmware/include/gbb_header.h | 31 |
2 files changed, 24 insertions, 13 deletions
diff --git a/firmware/2lib/include/2struct.h b/firmware/2lib/include/2struct.h index ae01c5de..6bc04600 100644 --- a/firmware/2lib/include/2struct.h +++ b/firmware/2lib/include/2struct.h @@ -224,6 +224,12 @@ enum vb2_gbb_flag { /* Disable PD software sync */ VB2_GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC = (1 << 11), + + /* + * Allow full fastboot capability in firmware even if + * dev_boot_fastboot_full_cap=0. + */ + VB2_GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP = (1 << 13), }; struct vb2_gbb_header { diff --git a/firmware/include/gbb_header.h b/firmware/include/gbb_header.h index e73ea95b..c413372c 100644 --- a/firmware/include/gbb_header.h +++ b/firmware/include/gbb_header.h @@ -34,39 +34,44 @@ /* Flags for .flags field */ /* Reduce the dev screen delay to 2 sec from 30 sec to speedup factory. */ -#define GBB_FLAG_DEV_SCREEN_SHORT_DELAY 0x00000001 +#define GBB_FLAG_DEV_SCREEN_SHORT_DELAY 0x00000001 /* * BIOS should load option ROMs from arbitrary PCI devices. We'll never enable * this ourselves because it executes non-verified code, but if a customer * wants to void their warranty and set this flag in the read-only flash, they * should be able to do so. */ -#define GBB_FLAG_LOAD_OPTION_ROMS 0x00000002 +#define GBB_FLAG_LOAD_OPTION_ROMS 0x00000002 /* * The factory flow may need the BIOS to boot a non-ChromeOS kernel if the * dev-switch is on. This flag allows that. */ -#define GBB_FLAG_ENABLE_ALTERNATE_OS 0x00000004 +#define GBB_FLAG_ENABLE_ALTERNATE_OS 0x00000004 /* Force dev switch on, regardless of physical/keyboard dev switch position. */ -#define GBB_FLAG_FORCE_DEV_SWITCH_ON 0x00000008 +#define GBB_FLAG_FORCE_DEV_SWITCH_ON 0x00000008 /* Allow booting from USB in dev mode even if dev_boot_usb=0. */ -#define GBB_FLAG_FORCE_DEV_BOOT_USB 0x00000010 +#define GBB_FLAG_FORCE_DEV_BOOT_USB 0x00000010 /* Disable firmware rollback protection. */ -#define GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020 +#define GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK 0x00000020 /* Allow Enter key to trigger dev->tonorm screen transition */ -#define GBB_FLAG_ENTER_TRIGGERS_TONORM 0x00000040 +#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 +#define GBB_FLAG_FORCE_DEV_BOOT_LEGACY 0x00000080 /* Allow booting using alternate keys for FAFT servo testing */ -#define GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100 +#define GBB_FLAG_FAFT_KEY_OVERIDE 0x00000100 /* Disable EC software sync */ -#define GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC 0x00000200 +#define GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC 0x00000200 /* Default to booting legacy OS when dev screen times out */ -#define GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY 0x00000400 +#define GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY 0x00000400 /* Disable PD software sync */ -#define GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC 0x00000800 +#define GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC 0x00000800 /* Disable shutdown on lid closed */ -#define GBB_FLAG_DISABLE_LID_SHUTDOWN 0x00001000 +#define GBB_FLAG_DISABLE_LID_SHUTDOWN 0x00001000 +/* + * Allow full fastboot capability in firmware even if + * dev_boot_fastboot_full_cap=0. + */ +#define GBB_FLAG_FORCE_DEV_BOOT_FASTBOOT_FULL_CAP 0x00002000 #ifdef __cplusplus extern "C" { |