scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-24 02:05:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vboot support for GBB flag to reduce boot time warning screen

Browse Source 
This is OFF by default, and must be turned on via the gbb_utility.

BUG=chrome-os-partner:2317
TEST=manual

Build a firmware image and flash it.  Should have the same 30-sec
delay as it does now.  Pressing TAB should show GBB flags = 0x0.

Modify the firmware image using gbb_utility to set GBB flags to 1 and
reboot.  Dev delay should be 2 sec.  Pressing TAB should show GBB
flags = 0x00000001.

Change-Id: If96ab9e7d0d142a9cd9a2c6af3849421d073de5e
Reviewed-on: http://gerrit.chromium.org/gerrit/4829
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Randall Spangler
2011-07-27 13:04:22 -07:00
parent cb320035d8
commit 4d3b127d19
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
firmware/lib/vboot_api_kernel.c
View File

@@ -274,17 +274,24 @@ static VbError_t VbDisplayDebugInfo(VbCommonParams* cparams) {
used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used, used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used,
shared->kernel_version_tpm, 16, 8); shared->kernel_version_tpm, 16, 8);
/* Add GBB flags */
used += Strncat(buf + used, "\ngbb.flags: 0x", DEBUG_INFO_SIZE - used);
if (gbb->major_version == GBB_MAJOR_VER && gbb->minor_version >= 1) {
used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used,
gbb->flags, 16, 8);
} else {
used += Strncat(buf + used, "0 (default)", DEBUG_INFO_SIZE - used);
}
/* Make sure we finish with a newline */ /* Make sure we finish with a newline */
used += Strncat(buf + used, "\n", DEBUG_INFO_SIZE - used); used += Strncat(buf + used, "\n", DEBUG_INFO_SIZE - used);
/* TODO: add more interesting data: /* TODO: add more interesting data:
* - SHA1 of kernel subkey (assuming we always set it in VbSelectFirmware, * - SHA1 of kernel subkey (assuming we always set it in VbSelectFirmware,
* even in recovery mode, where we just copy it from the root key) * even in recovery mode, where we just copy it from the root key)
* - Information on current disks * - Information on current disks */
* - Anything else interesting from VbNvStorage */
buf[DEBUG_INFO_SIZE - 1] = '\0'; buf[DEBUG_INFO_SIZE - 1] = '\0';
VBDEBUG(("VbCheckDisplayKey() wants to show '%s'\n", buf));
return VbExDisplayDebugInfo(buf); return VbExDisplayDebugInfo(buf);
} }
@@ -394,20 +401,30 @@ VbError_t VbBootNormal(VbCommonParams* cparams, LoadKernelParams* p) {
#define DEV_DELAY_BEEP1 20000 /* Beep for first time at this time */ #define DEV_DELAY_BEEP1 20000 /* Beep for first time at this time */
#define DEV_DELAY_BEEP2 21000 /* Beep for second time at this time */ #define DEV_DELAY_BEEP2 21000 /* Beep for second time at this time */
#define DEV_DELAY_TIMEOUT 30000 /* Give up at this time */ #define DEV_DELAY_TIMEOUT 30000 /* Give up at this time */
#define DEV_DELAY_TIMEOUT_SHORT 2000 /* Give up at this time (short delay) */
/* Handle a developer-mode boot */ /* Handle a developer-mode boot */
VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) { VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) {
GoogleBinaryBlockHeader* gbb = (GoogleBinaryBlockHeader*)cparams->gbb_data;
uint32_t delay_timeout = DEV_DELAY_TIMEOUT;
uint32_t delay_time = 0; uint32_t delay_time = 0;
uint32_t allow_usb = 0; uint32_t allow_usb = 0;
/* Check if USB booting is allowed */ /* Check if USB booting is allowed */
VbNvGet(&vnc, VBNV_DEV_BOOT_USB, &allow_usb); VbNvGet(&vnc, VBNV_DEV_BOOT_USB, &allow_usb);
/* Use a short developer screen delay if indicated by GBB flags */
if (gbb->major_version == GBB_MAJOR_VER && gbb->minor_version >= 1
&& (gbb->flags & GBB_FLAG_DEV_SCREEN_SHORT_DELAY)) {
VBDEBUG(("VbBootDeveloper() - using short developer screen delay\n"));
delay_timeout = DEV_DELAY_TIMEOUT_SHORT;
}
/* Show the dev mode warning screen */ /* Show the dev mode warning screen */
VbDisplayScreen(cparams, VB_SCREEN_DEVELOPER_WARNING, 0); VbDisplayScreen(cparams, VB_SCREEN_DEVELOPER_WARNING, 0);
/* Loop for dev mode warning delay */ /* Loop for dev mode warning delay */
for (delay_time = 0; delay_time < DEV_DELAY_TIMEOUT; for (delay_time = 0; delay_time < delay_timeout;
delay_time += DEV_DELAY_INCREMENT) { delay_time += DEV_DELAY_INCREMENT) {
uint32_t key; uint32_t key;