From db77048df1d683feb8e0f95aa776f5b315937fe2 Mon Sep 17 00:00:00 2001 From: Bill Richardson Date: Tue, 10 Jul 2012 17:54:59 -0700 Subject: [PATCH] Honor vboot's request to load the VGA option ROM 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 Reviewed-on: https://gerrit.chromium.org/gerrit/48173 Commit-Queue: Stefan Reinauer Reviewed-by: Stefan Reinauer Tested-by: Stefan Reinauer --- src/vendorcode/google/chromeos/vbnv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/vendorcode/google/chromeos/vbnv.c b/src/vendorcode/google/chromeos/vbnv.c index 2a2faf9e96..424005ad38 100644 --- a/src/vendorcode/google/chromeos/vbnv.c +++ b/src/vendorcode/google/chromeos/vbnv.c @@ -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; }