From 6d9c131061fbc984711cb97a0a24e7d4ce77549e Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 28 Mar 2019 13:33:55 -0700 Subject: vboot: Change oprom checks to CONFIG_VBOOT, assert OPROM_MATTERS Skipping display init on normal-mode boot is a vboot feature, not specific to Chrome OS. Fix the code in display_init_required() and pci_dev_init() to check CONFIG_VBOOT rather than CONFIG_CHROMEOS now that the two aren't always the same anymore. Also add a check to guarantee at compile time that CONFIG_VBOOT_OPROM_MATTERS is enabled on all platforms that make a check to this function (when CONFIG_VBOOT is also enabled). The whole display skipping mechanism is based on the oprom_needed NVRAM flag, and skipping display init without enabling the option to tell vboot that it needs to pay attention to that flag would make the whole thing not work right. Change-Id: I5d6421509bdcdaa61b78015af3fa6241fe75bb7f Signed-off-by: Julius Werner Reviewed-on: https://review.coreboot.org/c/coreboot/+/32112 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Patrick Georgi --- src/device/pci_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/device') diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 5f908d2f68..b5453c7e76 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -780,7 +780,7 @@ static int should_run_oprom(struct device *dev) */ should_run = display_init_required(); - if (!should_run && CONFIG(CHROMEOS)) + if (!should_run && CONFIG(VBOOT)) should_run = vboot_wants_oprom(); if (!should_run) -- cgit v1.2.3