From bae5262c692174e40f9cb06a5ac514a652f8cc76 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sat, 29 Nov 2025 22:55:29 -0600 Subject: [PATCH] include/option: Add verstage stub for UEFI variable store backend Verstage cannot use the UEFI variable store because it runs before the SMMSTORE is initialized/available, and because the required EDK2 headers are x86-specific. Provide inline stub that returns fallback values to satisfy console_init() dependency. TEST=build google/dewatt with CFR enabled Change-Id: Icaa493692006cf3e0bb194ee3fdd9caf2f51cda1 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/90295 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/include/option.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/include/option.h b/src/include/option.h index bee761acfb..083af9552d 100644 --- a/src/include/option.h +++ b/src/include/option.h @@ -8,8 +8,14 @@ void sanitize_cmos(void); /* The CBFS file option backend cannot be used in SMM due to vboot - * dependencies, which are not added to SMM */ -#if CONFIG(OPTION_BACKEND_NONE) || (CONFIG(USE_CBFS_FILE_OPTION_BACKEND) && ENV_SMM) + * dependencies, which are not added to SMM. + * The UEFI variable store option backend cannot be used in verstage because: + * - Verstage runs before SMM is available (needed for SMMSTORE access) + * - EDK2 headers required for UEFI variables are x86-specific and not available + * in ARM verstage (PSP verstage). */ +#if CONFIG(OPTION_BACKEND_NONE) || \ + (CONFIG(USE_CBFS_FILE_OPTION_BACKEND) && ENV_SMM) || \ + (CONFIG(USE_UEFI_VARIABLE_STORE) && ENV_SEPARATE_VERSTAGE) static inline unsigned int get_uint_option(const char *name, const unsigned int fallback) {