[XS] Change in coreboot[main]: security/vboot: Set VBOOT_MUST_REQUEST_DISPLAY if BMP_LOGO

[Yu-Ping Wu (Code Review)]

Yu-Ping Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83256?usp=email )

Change subject: security/vboot: Set VBOOT_MUST_REQUEST_DISPLAY if BMP_LOGO
......................................................................

security/vboot: Set VBOOT_MUST_REQUEST_DISPLAY if BMP_LOGO

If BMP_LOGO is set, currently display_init_required() will always return
1, so that platform code will always initialize display. However, that
information isn't passed to vboot, which may result in unnecessary extra
reboots, for example when the payload needs to request display init (by
vb2api_need_reboot_for_display()).

Since there is already a Kconfig option VBOOT_MUST_REQUEST_DISPLAY to
tell vboot that "display is available on this boot", enable it by
default if BMP_LOGO is set.

BUG=b:345085042
TEST=none
BRANCH=brya,rex

Change-Id: I20113ec464aa036d0498dedb50f0e82cb677ae93
Signed-off-by: Yu-Ping Wu 
---
M src/lib/bootmode.c
M src/security/vboot/Kconfig
2 files changed, 1 insertion(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/83256/1

diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index 2d5a7eb..3cf77d6 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -21,10 +21,6 @@

int display_init_required(void)
 {
-	/* Need display for showing splash screen. */
-	if (CONFIG(BMP_LOGO))
-		return 1;
-
    /* For vboot, honor VB2_CONTEXT_DISPLAY_INIT. */
    if (CONFIG(VBOOT)) {
    	/* Must always select MUST_REQUEST_DISPLAY when using this
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index d42dc74..e5ba701 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -146,7 +146,7 @@

config VBOOT_MUST_REQUEST_DISPLAY
    bool
-	default y if VGA_ROM_RUN
+	default y if VGA_ROM_RUN || BMP_LOGO
    default n
    help
      Set this option to indicate to vboot that this platform will skip its