From 89902e8c802eecefb75ef567245674b24df541de Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Tue, 2 Dec 2025 12:53:58 -0600
Subject: [PATCH] mb/google/hatch: Add CFR option menu support

Add CFR option menu support when using edk2 payload and SMMSTORE.
Include relevant items from Cometlake SoC, Intel common, and ChromeEC.

TEST=build/boot google/hatch (akemi), verify CFR option
functionality.

Change-Id: I29158a2d1fe6956799156fbe066ad4e97c110226
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/90343
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Jason Glenesk <jason.glenesk@gmail.com>
---
 src/mainboard/google/hatch/Kconfig     |  1 +
 src/mainboard/google/hatch/Makefile.mk |  1 +
 src/mainboard/google/hatch/cfr.c       | 47 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 src/mainboard/google/hatch/cfr.c

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 850234153f..1336c65eed 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -10,6 +10,7 @@ config BOARD_GOOGLE_BASEBOARD_HATCH
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_SX9310
+	select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select EC_GOOGLE_CHROMEEC
diff --git a/src/mainboard/google/hatch/Makefile.mk b/src/mainboard/google/hatch/Makefile.mk
index c1bd77a1f4..4ce672cbf8 100644
--- a/src/mainboard/google/hatch/Makefile.mk
+++ b/src/mainboard/google/hatch/Makefile.mk
@@ -6,6 +6,7 @@ bootblock-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-y += ramstage.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 
 romstage-$(CONFIG_ROMSTAGE_SPD_CBFS) += romstage_spd_cbfs.c
 romstage-$(CONFIG_ROMSTAGE_SPD_SMBUS) += romstage_spd_smbus.c
diff --git a/src/mainboard/google/hatch/cfr.c b/src/mainboard/google/hatch/cfr.c
new file mode 100644
index 0000000000..855b08d488
--- /dev/null
+++ b/src/mainboard/google/hatch/cfr.c
@@ -0,0 +1,47 @@
+
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <drivers/option/cfr_frontend.h>
+#include <ec/google/chromeec/cfr.h>
+#include <intelblocks/cfr.h>
+#include <soc/cfr.h>
+
+static struct sm_obj_form system = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&hyper_threading,
+		&igd_dvmt,
+		&igd_aperture,
+		&legacy_8254_timer,
+		&me_state,
+		&me_state_counter,
+		&pciexp_aspm,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		&pciexp_speed,
+		&s0ix_enable,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form ec = {
+	.ui_name = "ChromeEC Embedded Controller",
+	.obj_list = (const struct sm_object *[]) {
+		auto_fan_control,
+		&ec_kb_backlight,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system,
+	&ec,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}