Switch from CMOS options to UEFI variable store

Signed-off-by: Tim Crawford <tcrawford@system76.com>
2025-07-03 21:03:23 +00:00 · 2025-01-24 14:19:26 -07:00 · 2025-01-24 14:19:26 -07:00 · 82454f76f0
commit 82454f76f0
parent 7c15b7dacb
48 changed files with 48 additions and 48 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 01d12047685465e63dc75f05a36602458a056075
+Subproject commit dc33cd724e91915b359364767dea4200bc9461c8
--- a/models/addw1/coreboot.config
+++ b/models/addw1/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/addw2/coreboot.config
+++ b/models/addw2/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/addw3/coreboot.config
+++ b/models/addw3/coreboot.config
@ -17,6 +17,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/addw4/coreboot.config
+++ b/models/addw4/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/bonw14/coreboot.config
+++ b/models/bonw14/coreboot.config
@ -16,6 +16,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/bonw15-b/coreboot.config
+++ b/models/bonw15-b/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/bonw15/coreboot.config
+++ b/models/bonw15/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/darp10-b/coreboot.config
+++ b/models/darp10-b/coreboot.config
@ -16,7 +16,7 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y

--- a/models/darp10/coreboot.config
+++ b/models/darp10/coreboot.config
@ -16,7 +16,7 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y

--- a/models/darp5/coreboot.config
+++ b/models/darp5/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/darp6/coreboot.config
+++ b/models/darp6/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/darp7/coreboot.config
+++ b/models/darp7/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/darp8/coreboot.config
+++ b/models/darp8/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/darp9/coreboot.config
+++ b/models/darp9/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp2/coreboot.config
+++ b/models/galp2/coreboot.config
@ -15,6 +15,6 @@ CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
 CONFIG_USE_ME_CLEANER=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp3-b/coreboot.config
+++ b/models/galp3-b/coreboot.config
@ -15,6 +15,6 @@ CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
 CONFIG_USE_ME_CLEANER=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp3-c/coreboot.config
+++ b/models/galp3-c/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp3/coreboot.config
+++ b/models/galp3/coreboot.config
@ -15,6 +15,6 @@ CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
 CONFIG_USE_ME_CLEANER=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp4/coreboot.config
+++ b/models/galp4/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp5/coreboot.config
+++ b/models/galp5/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp6/coreboot.config
+++ b/models/galp6/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/galp7/coreboot.config
+++ b/models/galp7/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze14_1650/coreboot.config
+++ b/models/gaze14_1650/coreboot.config
@ -12,6 +12,6 @@ CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze14_1660ti/coreboot.config
+++ b/models/gaze14_1660ti/coreboot.config
@ -12,6 +12,6 @@ CONFIG_PAYLOAD_FILE="$(FIRMWARE_OPEN_UEFIPAYLOAD)"
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze15/coreboot.config
+++ b/models/gaze15/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze16-3050/coreboot.config
+++ b/models/gaze16-3050/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze16-3060-b/coreboot.config
+++ b/models/gaze16-3060-b/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze16-3060/coreboot.config
+++ b/models/gaze16-3060/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze17-3050/coreboot.config
+++ b/models/gaze17-3050/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze17-3060-b/coreboot.config
+++ b/models/gaze17-3060-b/coreboot.config
@ -17,6 +17,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/gaze18/coreboot.config
+++ b/models/gaze18/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/lemp10/coreboot.config
+++ b/models/lemp10/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/lemp11/coreboot.config
+++ b/models/lemp11/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/lemp12/coreboot.config
+++ b/models/lemp12/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/lemp13-b/coreboot.config
+++ b/models/lemp13-b/coreboot.config
@ -18,6 +18,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/lemp13/coreboot.config
+++ b/models/lemp13/coreboot.config
@ -18,6 +18,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/lemp9/coreboot.config
+++ b/models/lemp9/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/meer9/coreboot.config
+++ b/models/meer9/coreboot.config
@ -17,7 +17,7 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 # Debug
 CONFIG_CONSOLE_SERIAL=n
--- a/models/oryp10/coreboot.config
+++ b/models/oryp10/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp11/coreboot.config
+++ b/models/oryp11/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp12/coreboot.config
+++ b/models/oryp12/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp5/coreboot.config
+++ b/models/oryp5/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp6/coreboot.config
+++ b/models/oryp6/coreboot.config
@ -14,6 +14,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp7/coreboot.config
+++ b/models/oryp7/coreboot.config
@ -14,6 +14,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp8/coreboot.config
+++ b/models/oryp8/coreboot.config
@ -15,6 +15,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/oryp9/coreboot.config
+++ b/models/oryp9/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y
--- a/models/serw13/coreboot.config
+++ b/models/serw13/coreboot.config
@ -13,6 +13,6 @@ CONFIG_POST_IO=n
 CONFIG_SMMSTORE=y
 CONFIG_SMMSTORE_V2=y
 CONFIG_TPM_PPI=y
-CONFIG_USE_OPTION_TABLE=y
+CONFIG_USE_UEFI_VARIABLE_STORE=y
 CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
 #CONFIG_CONSOLE_SYSTEM76_EC=y