From e9a01dea32131fb1eec9a7727b1951f75cd17a57 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Fri, 10 Oct 2025 13:53:23 -0500
Subject: [PATCH] mb/purism/librem_jsl: Add CFR option menu support

Add CFR option menu support when using edk2 payload and SMMSTORE.
Drop the Intel ME-related options since these boards ship with the
ME disabled via HAP.

Change-Id: I09be7910a62441df95b186c8554bc2fe3bf8c92f
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/89533
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
---
 src/mainboard/purism/librem_jsl/Kconfig     |  1 +
 src/mainboard/purism/librem_jsl/Makefile.mk |  1 +
 src/mainboard/purism/librem_jsl/cfr.c       | 32 +++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 src/mainboard/purism/librem_jsl/cfr.c

diff --git a/src/mainboard/purism/librem_jsl/Kconfig b/src/mainboard/purism/librem_jsl/Kconfig
index 2198dd60f8..d87a1580bf 100644
--- a/src/mainboard/purism/librem_jsl/Kconfig
+++ b/src/mainboard/purism/librem_jsl/Kconfig
@@ -4,6 +4,7 @@ config BOARD_PURISM_BASEBOARD_LIBREM_JSL
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_GENERIC_CBFS_SERIAL
+	select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE
 	select DRIVERS_USB_ACPI
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_HID
diff --git a/src/mainboard/purism/librem_jsl/Makefile.mk b/src/mainboard/purism/librem_jsl/Makefile.mk
index 7fd4d59f90..65226dfb3d 100644
--- a/src/mainboard/purism/librem_jsl/Makefile.mk
+++ b/src/mainboard/purism/librem_jsl/Makefile.mk
@@ -3,4 +3,5 @@
 bootblock-y += bootblock.c
 ramstage-y += ramstage.c
 ramstage-y += hda_verb.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR_ENABLED) += cfr.c
 SPD_SOURCES += isocon8gb
diff --git a/src/mainboard/purism/librem_jsl/cfr.c b/src/mainboard/purism/librem_jsl/cfr.c
new file mode 100644
index 0000000000..2fd5e3565d
--- /dev/null
+++ b/src/mainboard/purism/librem_jsl/cfr.c
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <drivers/option/cfr_frontend.h>
+#include <intelblocks/cfr.h>
+#include <soc/cfr.h>
+
+static struct sm_obj_form system = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&igd_dvmt,
+		&igd_aperture,
+		&legacy_8254_timer,
+		&pciexp_aspm,
+		&pciexp_clk_pm,
+		&pciexp_l1ss,
+		&pciexp_speed,
+		&s0ix_enable,
+		&vtd,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}