erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Honor vboot's request to load the VGA option ROM

Browse source 
This removes an earlier patch that caused the VGA option ROM to be loaded by
coreboot even in normal mode when it isn't needed.

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

Using keyboard-based developer mode, switch between normal and dev-mode and
back. It should work as expected.

(cherry-picked from b76d9a63d331b2b3fb6b5379882a11daae4725ee)

Change-Id: Ie0a331a10fff212a2394e7234a0dbb37570607b7
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48173
Commit-Queue: Stefan Reinauer <reinauer@google.com>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Stefan Reinauer <reinauer@google.com>
This commit is contained in:
Bill Richardson 2012-07-10 17:54:59 -07:00 • committed by ChromeBot
commit db77048df1
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/vendorcode/google/chromeos/vbnv.c
View file

@ -125,11 +125,5 @@ int vboot_wants_oprom(void)
if (!vbnv_initialized)
vbnv_setup();
/* FIXME(crosbug.com/p/8789). The following commented-out line does the
* right thing, assuming that vboot has requested the option ROM and
* rebooted if it finds that it's needed but not loaded. At the moment,
* it doesn't yet do that, so we must always say we want it. */
/* return (vbnv[BOOT_OFFSET] & BOOT_OPROM_NEEDED) ? 1 : 0; */
return 1;
return (vbnv[BOOT_OFFSET] & BOOT_OPROM_NEEDED) ? 1 : 0;
}