From 6a89cf3ef305a82dbc097d73693a58f687c4b19a 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. 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 Reviewed-on: http://review.coreboot.org/4125 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- 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 58ccbdb72f..a13726d04b 100644 --- a/src/vendorcode/google/chromeos/vbnv.c +++ b/src/vendorcode/google/chromeos/vbnv.c @@ -143,11 +143,5 @@ int vboot_wants_oprom(void) if (!is_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_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0; */ - return 1; + return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0; }