diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2024-06-28 16:26:43 +0800 |
|---|---|---|
| committer | Yu-Ping Wu <yupingso@google.com> | 2024-07-03 08:43:01 +0000 |
| commit | 409860687baf68ac3f4f27d234f6e08afa6ad309 (patch) | |
| tree | 205e5599549f686e8397ee175afa3beb69b1dd51 /src | |
| parent | 2d8fcc8778c32ebbb618c627eaacaaa744e74921 (diff) | |
security/vboot: Set VBOOT_ALWAYS_ENABLE_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_ALWAYS_ENABLE_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=none
Change-Id: I20113ec464aa036d0498dedb50f0e82cb677ae93
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83256
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/bootmode.c | 4 | ||||
| -rw-r--r-- | src/security/vboot/Kconfig | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c index 2d5a7eb004..3cf77d6fd8 100644 --- a/src/lib/bootmode.c +++ b/src/lib/bootmode.c @@ -21,10 +21,6 @@ void gfx_set_init_done(int done) 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 d42dc74c51..e30e8ee372 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -156,6 +156,7 @@ config VBOOT_MUST_REQUEST_DISPLAY config VBOOT_ALWAYS_ENABLE_DISPLAY bool "Force to always enable display" + default y if BMP_LOGO default n help Set this option to indicate to vboot that display should always be enabled. |