mb/system76: Switch from CMOS options to UEFI vars

src/mainboard/system76/addw1/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_ADDW1 || BOARD_SYSTEM76_ADDW2
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
@@ -15,8 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_OLED
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM

src/mainboard/system76/adl/Kconfig

@@ -3,6 +3,7 @@
 config BOARD_SYSTEM76_ADL_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
@@ -13,8 +14,6 @@ config BOARD_SYSTEM76_ADL_COMMON
 	select EC_SYSTEM76_EC_LOCKDOWN
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_TPM2
@@ -103,10 +102,6 @@ config MAINBOARD_VERSION
 	default "oryp9" if BOARD_SYSTEM76_ORYP9
 	default "oryp10" if BOARD_SYSTEM76_ORYP10
 
-config CMOS_DEFAULT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos-csme.default" if BOARD_SYSTEM76_DARP8
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
-
 config CONSOLE_POST
 	default y
 

src/mainboard/system76/bonw14/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_BONW14
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
@@ -14,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_DGPU
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2

src/mainboard/system76/cml-u/Kconfig

@@ -5,14 +5,13 @@ if BOARD_SYSTEM76_DARP6 || BOARD_SYSTEM76_GALP4 || BOARD_SYSTEM76_LEMP9
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_I2C_HID
 	select EC_SYSTEM76_EC
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select HAVE_SPD_IN_CBFS if BOARD_SYSTEM76_LEMP9
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE

src/mainboard/system76/gaze15/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_GAZE14 || BOARD_SYSTEM76_GAZE15
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
@@ -13,8 +14,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_DGPU
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM

src/mainboard/system76/kbl-u/Kconfig

@@ -5,12 +5,11 @@ if BOARD_SYSTEM76_GALP2 || BOARD_SYSTEM76_GALP3 || BOARD_SYSTEM76_GALP3_B
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM

src/mainboard/system76/meer9/Kconfig

@@ -4,14 +4,13 @@ config BOARD_SYSTEM76_MEER9_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
 	select CRB_TPM
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_UART_8250IO
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
 	select HAVE_INTEL_PTT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select MAINBOARD_HAS_TPM2
 	select NO_UART_ON_SUPERIO
@@ -46,9 +45,6 @@ config MAINBOARD_SMBIOS_PRODUCT_NAME
 config MAINBOARD_VERSION
 	default "meer9" if BOARD_SYSTEM76_MEER9
 
-config CMOS_DEFAULT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
-
 config CONSOLE_POST
 	default y
 

src/mainboard/system76/mtl/Kconfig

@@ -3,6 +3,7 @@
 config BOARD_SYSTEM76_MTL_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
@@ -11,8 +12,6 @@ config BOARD_SYSTEM76_MTL_COMMON
 	select EC_SYSTEM76_EC_LOCKDOWN
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_TPM2
@@ -100,9 +99,6 @@ config MAINBOARD_VERSION
 	default "lemp13" if BOARD_SYSTEM76_LEMP13
 	default "lemp13-b" if BOARD_SYSTEM76_LEMP13_B
 
-config CMOS_DEFAULT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
-
 config CONSOLE_POST
 	default y
 

src/mainboard/system76/oryp5/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_ORYP5
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
@@ -14,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_DGPU
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM

src/mainboard/system76/oryp6/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_ORYP6 || BOARD_SYSTEM76_ORYP7
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
@@ -14,8 +15,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_DGPU
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM2

src/mainboard/system76/rpl/Kconfig

@@ -3,6 +3,7 @@
 config BOARD_SYSTEM76_RPL_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_BAYHUB_LV2 if !BOARD_SYSTEM76_BONW15
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
@@ -11,8 +12,6 @@ config BOARD_SYSTEM76_RPL_COMMON
 	select EC_SYSTEM76_EC_LOCKDOWN
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_TPM2
@@ -168,10 +167,6 @@ config MAINBOARD_VERSION
 	default "oryp12" if BOARD_SYSTEM76_ORYP12
 	default "serw13" if BOARD_SYSTEM76_SERW13
 
-config CMOS_DEFAULT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos-csme.default" if BOARD_SYSTEM76_DARP9
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
-
 config CONSOLE_POST
 	default y
 

src/mainboard/system76/tgl-h/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_GAZE16_3050 || BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GA
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
@@ -16,8 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_LOCKDOWN
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM

src/mainboard/system76/tgl-u/Kconfig

@@ -5,6 +5,7 @@ if BOARD_SYSTEM76_DARP7 || BOARD_SYSTEM76_GALP5 || BOARD_SYSTEM76_LEMP10
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
@@ -16,8 +17,6 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_SYSTEM76_EC_DGPU if BOARD_SYSTEM76_GALP5
 	select EC_SYSTEM76_EC_LOCKDOWN
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select HAVE_SPD_IN_CBFS if BOARD_SYSTEM76_LEMP10
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE

src/mainboard/system76/whl-u/Kconfig

@@ -5,14 +5,13 @@ if BOARD_SYSTEM76_GALP3_C || BOARD_SYSTEM76_DARP5
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_I2C_HID
 	select EC_SYSTEM76_EC
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select HAVE_CMOS_DEFAULT
-	select HAVE_OPTION_TABLE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MEMORY_MAPPED_TPM