mb/system76: Switch from CMOS options to UEFI vars

src/mainboard/system76/addw1/Kconfig

@@ -6,18 +6,19 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select AZALIA_USE_LEGACY_VERB_TABLE
 	select BOARD_ROMSIZE_KB_16384
+	select CSE_DEFAULT_CFR_OPTION_STATE_DISABLED
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_TAS5825M
+	select DRIVERS_OPTION_CFR_ENABLED
 	select EC_SYSTEM76_EC
 	select EC_SYSTEM76_EC_DGPU
 	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/addw1/Makefile.mk

@@ -11,3 +11,4 @@ ramstage-y += ramstage.c
 ramstage-y += variants/$(VARIANT_DIR)/gpio.c
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
 ramstage-y += variants/$(VARIANT_DIR)/tas5825m.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c

src/mainboard/system76/addw1/cfr.c

@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <console/cfr.h>
+#include <intelblocks/cfr.h>
+
+static struct sm_obj_form system_group = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		&me_state,
+		&me_state_counter,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system_group,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}

src/mainboard/system76/adl/Kconfig

@@ -4,18 +4,19 @@ config BOARD_SYSTEM76_ADL_COMMON
 	def_bool n
 	select AZALIA_USE_LEGACY_VERB_TABLE
 	select BOARD_ROMSIZE_KB_32768
+	select CSE_DEFAULT_CFR_OPTION_STATE_DISABLED if !BOARD_SYSTEM76_DARP8
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_I2C_HID
 	select DRIVERS_INTEL_PMC
 	select DRIVERS_INTEL_USB4_RETIMER
+	select DRIVERS_OPTION_CFR_ENABLED
 	select EC_SYSTEM76_EC
 	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
@@ -104,10 +105,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/adl/Makefile.mk

@@ -15,5 +15,6 @@ ramstage-y += ramstage.c
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
 ramstage-y += variants/$(VARIANT_DIR)/gpio.c
 ramstage-$(CONFIG_DRIVERS_I2C_TAS5825M) += variants/$(VARIANT_DIR)/tas5825m.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 
 SPD_SOURCES = samsung-P4AAF165WA-BCWDE

src/mainboard/system76/adl/cfr.c

@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <console/cfr.h>
+#include <intelblocks/cfr.h>
+
+static struct sm_obj_form system_group = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		&me_state,
+		&me_state_counter,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system_group,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}

src/mainboard/system76/bonw14/Kconfig

@@ -6,17 +6,18 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select AZALIA_USE_LEGACY_VERB_TABLE
 	select BOARD_ROMSIZE_KB_16384
+	select CSE_DEFAULT_CFR_OPTION_STATE_DISABLED
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_TAS5825M
+	select DRIVERS_OPTION_CFR_ENABLED
 	select EC_SYSTEM76_EC
 	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/bonw14/Makefile.mk

@@ -11,3 +11,4 @@ ramstage-y += ramstage.c
 ramstage-y += gpio.c
 ramstage-y += hda_verb.c
 ramstage-y += tas5825m.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c

src/mainboard/system76/bonw14/cfr.c

@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <console/cfr.h>
+#include <intelblocks/cfr.h>
+
+static struct sm_obj_form system_group = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		&me_state,
+		&me_state_counter,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system_group,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}

src/mainboard/system76/cml-u/Kconfig

@@ -6,14 +6,15 @@ config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select AZALIA_USE_LEGACY_VERB_TABLE
 	select BOARD_ROMSIZE_KB_16384
+	select CSE_DEFAULT_CFR_OPTION_STATE_DISABLED
+	select DRIVERS_EFI_VARIABLE_STORE
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_I2C_HID
+	select DRIVERS_OPTION_CFR_ENABLED
 	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/cml-u/Makefile.mk

@@ -10,5 +10,6 @@ romstage-y += variants/$(VARIANT_DIR)/romstage.c
 ramstage-y += ramstage.c
 ramstage-y += variants/$(VARIANT_DIR)/gpio.c
 ramstage-y += variants/$(VARIANT_DIR)/hda_verb.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 
 SPD_SOURCES  = samsung-K4AAG165WA-BCTD

src/mainboard/system76/cml-u/cfr.c

@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <console/cfr.h>
+#include <intelblocks/cfr.h>
+
+static struct sm_obj_form system_group = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&debug_level,
+		&me_state,
+		&me_state_counter,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system_group,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}