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

Add VB_INIT_OUT_ENABLE_ALTERNATE_OS flag

Browse Source 
This adds a flag to the list of values returned by VbInit(). When
this flag is set, the BIOS may be asked to boot something other than
ChromeOS. If this requires some sort of special preparation, the BIOS
should do it.

BUG=chromium-os:22454
TEST=none

There is no test for this. It requires a change to the BIOS in order
to do anything differently, and we haven't yet decided whether the
BIOS should pay attention to it.

Change-Id: I5d89e7cd5b745ee74b8ace7fa613c0db03eebefd
Reviewed-on: https://gerrit.chromium.org/gerrit/11714
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Bill Richardson
2011-11-15 11:32:54 -08:00
parent 6a6f85d6bb
commit 0d11efb0dc
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/lib/vboot_api_init.c
View File

@@ -22,6 +22,7 @@ VbError_t VbInit(VbCommonParams* cparams, VbInitParams* iparams) {
uint32_t recovery = VBNV_RECOVERY_NOT_REQUESTED;
int is_s3_resume = 0;
uint32_t s3_debug_boot = 0;
uint32_t user_enabled_custom_os = 0;
VBDEBUG(("VbInit() input flags 0x%x\n", iparams->flags));
@@ -105,12 +106,27 @@ VbError_t VbInit(VbCommonParams* cparams, VbInitParams* iparams) {
iparams->out_flags |= (VB_INIT_OUT_CLEAR_RAM |
VB_INIT_OUT_ENABLE_DISPLAY |
VB_INIT_OUT_ENABLE_USB_STORAGE);
/* ... which could include custom OSes */
VbNvGet(&vnc, VBNV_DEV_BOOT_CUSTOM, &user_enabled_custom_os);
if (user_enabled_custom_os)
iparams->out_flags |= VB_INIT_OUT_ENABLE_ALTERNATE_OS;
} else {
/* Normal mode, so disable dev_boot_* flags. This ensures they will be
* initially disabled if the user later transitions back into developer
* mode. */
VbNvSet(&vnc, VBNV_DEV_BOOT_USB, 0);
VbNvSet(&vnc, VBNV_DEV_BOOT_CUSTOM, 0);
}
/* Allow BIOS to load arbitrary option ROMs? */
if (gbb->flags & GBB_FLAG_LOAD_OPTION_ROMS)
iparams->out_flags |= VB_INIT_OUT_ENABLE_OPROM;
/* The factory may need to boot custom OSes whenever the dev-switch is on */
if ((gbb->flags & GBB_FLAG_ENABLE_ALTERNATE_OS) &&
(iparams->flags & VB_INIT_FLAG_DEV_SWITCH_ON))
iparams->out_flags |= VB_INIT_OUT_ENABLE_ALTERNATE_OS;
/* copy current recovery reason to shared data */
shared->recovery_reason = (uint8_t)recovery;