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 <subratabanik@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/87283 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com>
37 lines
779 B
C
37 lines
779 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
|
|
#include <assert.h>
|
|
#include <bootmode.h>
|
|
#include <security/vboot/misc.h>
|
|
#include <vb2_api.h>
|
|
|
|
static int gfx_init_done = -1;
|
|
|
|
int gfx_get_init_done(void)
|
|
{
|
|
if (gfx_init_done < 0)
|
|
return 0;
|
|
return gfx_init_done;
|
|
}
|
|
|
|
void gfx_set_init_done(int done)
|
|
{
|
|
gfx_init_done = done;
|
|
}
|
|
|
|
int display_init_required(void)
|
|
{
|
|
/* For vboot, honor VB2_CONTEXT_DISPLAY_INIT. */
|
|
if (CONFIG(VBOOT)) {
|
|
/*
|
|
* 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;
|
|
}
|
|
|
|
/* By default always initialize display. */
|
|
return 1;
|
|
}
|