summaryrefslogtreecommitdiff
path: root/src/vendorcode
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2012-07-10 17:54:59 -0700
committerAlexandru Gagniuc <mr.nuke.me@gmail.com>2013-11-24 05:42:16 +0100
commit6a89cf3ef305a82dbc097d73693a58f687c4b19a (patch)
tree3dc6aab39747a57879c88658fd039046a0c0ce18 /src/vendorcode
parent047c98a2c1b9a9dfc4568b1b1471aab7cfcae606 (diff)
downloadcoreboot-6a89cf3ef305a82dbc097d73693a58f687c4b19a.tar.xz
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 <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> Reviewed-on: http://review.coreboot.org/4125 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/vendorcode')
-rw-r--r--src/vendorcode/google/chromeos/vbnv.c8
1 files changed, 1 insertions, 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;
}