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) {