summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Walter <christian.walter@9elements.com>2019-07-29 09:54:23 +0000
committerPatrick Rudolph <siro@das-labor.org>2019-07-29 17:21:09 +0000
commit90cf4bb02aac15a41873ef9435d826b143a0a04e (patch)
treea12ea583774334141cacf4ed12d6a30c3712dad5 /src
parent98d5a86ec04259e47a8ebcc7cdcf83c3fe73352a (diff)
downloadcoreboot-90cf4bb02aac15a41873ef9435d826b143a0a04e.tar.xz
Revert "src/security/vboot: Add option to skip display init with vboot 2.0"
This reverts commit 598af2e2c2785c00eb4290cdcefe1082b2a6f858. Reason for revert: This commit breaks every board with VBOOT enabled if the platform is apollolake, broadwell, skylake, baswell, baytrails or icelake. The reason is, that the SoC selects VBOOT_MUST_REQUEST_DISPLAY by default, and this has a dependency now on VBOOT_MAY_SKIP_DISPLAY_INIT. This will only be auto-selected if it is a CHROMEOS platform. Change-Id: I3872d9aa993326ded135d8a5d950d5b1b1eddf34 Signed-off-by: Christian Walter <christian.walter@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34308 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/lib/bootmode.c4
-rw-r--r--src/security/vboot/Kconfig11
2 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index 083fd9d49d..2465966b3a 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -2,7 +2,6 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2011 The ChromiumOS Authors. All rights reserved.
- * Copyright (C) 2019 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,7 +33,8 @@ void gfx_set_init_done(int done)
int display_init_required(void)
{
- if (CONFIG(VBOOT_MAY_SKIP_DISPLAY_INIT)) {
+ /* For vboot, always honor VBOOT_WD_FLAG_DISPLAY_INIT. */
+ if (CONFIG(VBOOT)) {
/* Must always select MUST_REQUEST_DISPLAY when using this
function. */
if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY))
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index fa9893520a..ea1f73889a 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -154,21 +154,10 @@ config VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT
reboots caused after vboot verification is run. e.g. reboots caused by
FSP components on Intel platforms.
-config VBOOT_MAY_SKIP_DISPLAY_INIT
- bool "Skip display initialization in normal mode"
- default y if CHROMEOS
- default n
- help
- Set this option to indicate that coreboot should skip display
- initialization on a normal (non-recovery, non-developer) boot.
- This is useful for platforms that do not support firmware
- user-interface in normal mode.
-
config VBOOT_MUST_REQUEST_DISPLAY
bool
default y if VGA_ROM_RUN
default n
- depends on VBOOT_MAY_SKIP_DISPLAY_INIT
help
Set this option to indicate to vboot that this platform will skip its
display initialization on a normal (non-recovery, non-developer) boot.