summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2019-11-15 14:02:02 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-16 20:45:30 +0000
commite7087a19bc158e1bbbe6b2bfaef53e38a644f99c (patch)
tree72dcf738c19f3b25f08524d2f4bc0e4f1f324ab1
parent3557f124586851ee89deccf91c66c9ea50f9ffd4 (diff)
downloadcoreboot-e7087a19bc158e1bbbe6b2bfaef53e38a644f99c.tar.xz
security/vboot: Add config option to always enable the display
In order to always show the bootlogo very early in coreboot we need the option to always enable the display when VBOOT is enabled. To do this a config option is added to make sure this functionality can be provided without interfering with systems that require the standard VBOOT display handing. BUG=N/A TEST=tested on facebook fbg1701. Change-Id: I3ffaac85d2082717bb9608d536f7cec66a583789 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36547 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/security/vboot/Kconfig6
-rw-r--r--src/security/vboot/vboot_logic.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index 70180c719a..89e12323b6 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -167,6 +167,12 @@ config VBOOT_MUST_REQUEST_DISPLAY
Unless display is specifically requested, the video option ROM is not
loaded, and any other native display initialization code is not run.
+config VBOOT_ALWAYS_ENABLE_DISPLAY
+ bool "Force to always enable display"
+ default n
+ help
+ Set this option to indicate to vboot that display should always be enabled.
+
config VBOOT_HAS_REC_HASH_SPACE
bool
default n
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index c4389a9bc1..5facd283ee 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -369,7 +369,7 @@ void verstage_main(void)
ctx->flags |= VB2_CONTEXT_NOFAIL_BOOT;
/* Mainboard/SoC always initializes display. */
- if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY))
+ if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY) || CONFIG(VBOOT_ALWAYS_ENABLE_DISPLAY))
ctx->flags |= VB2_CONTEXT_DISPLAY_INIT;
/* Do early init (set up secdata and NVRAM, load GBB) */