diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index eb3b985e5a..9122e8750f 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -3,6 +3,7 @@
 config BOARD_GOOGLE_BASEBOARD_JECHT
 	def_bool n
 	select BOARD_ROMSIZE_KB_8192
+	select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/google/jecht/Makefile.mk b/src/mainboard/google/jecht/Makefile.mk
index ed74d75109..43d6b2471d 100644
--- a/src/mainboard/google/jecht/Makefile.mk
+++ b/src/mainboard/google/jecht/Makefile.mk
@@ -16,6 +16,7 @@ bootblock-y += led.c
 bootblock-y += bootblock.c
 
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 
 subdirs-y += variants/$(VARIANT_DIR)
 CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include
diff --git a/src/mainboard/google/jecht/cfr.c b/src/mainboard/google/jecht/cfr.c
new file mode 100644
index 0000000000..9f4d19088e
--- /dev/null
+++ b/src/mainboard/google/jecht/cfr.c
@@ -0,0 +1,33 @@
+
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <drivers/option/cfr_frontend.h>
+#include <soc/cfr.h>
+
+static struct sm_obj_form system = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&me_disable,
+		NULL
+	},
+};
+
+static struct sm_obj_form power = {
+	.ui_name = "Power",
+	.obj_list = (const struct sm_object *[]) {
+		&power_on_after_fail,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&system,
+	&power,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}