summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-03-28 13:33:55 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-04-02 13:08:43 +0000
commit6d9c131061fbc984711cb97a0a24e7d4ce77549e (patch)
treea09a2b55b8036b5f9d6cceffc8542720e9b2e225
parentb197808852a51243ebbcca502319b1e3e4cb4ddb (diff)
downloadcoreboot-6d9c131061fbc984711cb97a0a24e7d4ce77549e.tar.xz
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 <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32112 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--src/device/pci_device.c2
-rw-r--r--src/lib/bootmode.c9
2 files changed, 8 insertions, 3 deletions
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)
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index e402536fde..052eb8f282 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <assert.h>
#include <bootmode.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -34,9 +35,13 @@ void gfx_set_init_done(int done)
int display_init_required(void)
{
- /* For Chrome OS always honor vboot_handoff_skip_display_init(). */
- if (CONFIG(CHROMEOS))
+ /* For vboot always honor vboot_handoff_skip_display_init(). */
+ if (CONFIG(VBOOT)) {
+ /* Must always select OPROM_MATTERS when using this function. */
+ if (!CONFIG(VBOOT_OPROM_MATTERS))
+ dead_code();
return !vboot_handoff_skip_display_init();
+ }
/* By default always initialize display. */
return 1;