3 files changed, 40 insertions, 0 deletions
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 456791fdf3b0..5d8bc3232659 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -5,6 +5,7 @@ if BOARD_SAMSUNG_STUMPY
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_8192
+	select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE
 	select MAINBOARD_HAS_CHROMEOS
 	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
diff --git a/src/mainboard/samsung/stumpy/Makefile.mk b/src/mainboard/samsung/stumpy/Makefile.mk
index 57ec1c504820..ab23599f6063 100644
--- a/src/mainboard/samsung/stumpy/Makefile.mk
+++ b/src/mainboard/samsung/stumpy/Makefile.mk
@@ -8,3 +8,5 @@ romstage-y += gpio.c
 ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads
 bootblock-y += early_init.c
 romstage-y += early_init.c
+
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
diff --git a/src/mainboard/samsung/stumpy/cfr.c b/src/mainboard/samsung/stumpy/cfr.c
new file mode 100644
index 000000000000..d1650a05032c
--- /dev/null
+++ b/src/mainboard/samsung/stumpy/cfr.c
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <drivers/option/cfr_frontend.h>
+#include <northbridge/intel/sandybridge/cfr.h>
+#include <southbridge/intel/bd82x6x/cfr.h>
+
+static struct sm_obj_form system = {
+	.ui_name = "System",
+	.obj_list = (const struct sm_object *[]) {
+		&gfx_uma_size,
+		&me_state,
+		&me_state_prev,
+		&nmi,
+		&sata_mode,
+		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);
+}