From 9dd96f58f3a81a04f8b39f8675a50de32b6d932d Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Fri, 11 Apr 2025 22:59:02 +0530 Subject: [PATCH] lib/bootmode: Enforce display init requirement for vboot The `display_init_required` function for vboot now mandates that either `CONFIG_VBOOT_MUST_REQUEST_DISPLAY` or `CONFIG_VBOOT_ALWAYS_ENABLE_DISPLAY` must be enabled. If neither of these Kconfig options is set when `CONFIG_VBOOT` is enabled, the code will now trigger `dead_code()`. This enforces the requirement that display initialization is explicitly requested or always enabled when vboot is active, aligning with the intended usage of `VB2_CONTEXT_DISPLAY_INIT`. TEST=Able to build google/fatcat. Change-Id: I371c0533057fb088ea15a5da6bd76173cea525aa Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/87283 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu --- src/lib/bootmode.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c index 3cf77d6fd8..dbfeb32a63 100644 --- a/src/lib/bootmode.c +++ b/src/lib/bootmode.c @@ -23,9 +23,11 @@ int display_init_required(void) { /* For vboot, honor VB2_CONTEXT_DISPLAY_INIT. */ if (CONFIG(VBOOT)) { - /* Must always select MUST_REQUEST_DISPLAY when using this - function. */ - if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY)) + /* + * Display init requires VBOOT_MUST_REQUEST_DISPLAY || VBOOT_ALWAYS_ENABLE_DISPLAY; + * else assert build. + */ + if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY) && !CONFIG(VBOOT_ALWAYS_ENABLE_DISPLAY)) dead_code(); return vboot_get_context()->flags & VB2_CONTEXT_DISPLAY_INIT; }