diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index e1718bb2fd..4977602d3b 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -42,6 +42,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_HID
 	select DRIVERS_I2C_NAU8825
+	select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE
 	select DRIVERS_USB_HUB
 	select DRIVERS_UART_ACPI
 	select DRIVERS_PCIE_GENERIC
diff --git a/src/mainboard/google/skyrim/Makefile.mk b/src/mainboard/google/skyrim/Makefile.mk
index 933341314e..8240e3e214 100644
--- a/src/mainboard/google/skyrim/Makefile.mk
+++ b/src/mainboard/google/skyrim/Makefile.mk
@@ -8,6 +8,7 @@ ramstage-y += mainboard.c
 ramstage-y += ec.c
 ramstage-y += port_descriptors.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 
 verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c
 
diff --git a/src/mainboard/google/skyrim/cfr.c b/src/mainboard/google/skyrim/cfr.c
new file mode 100644
index 0000000000..5822ae9226
--- /dev/null
+++ b/src/mainboard/google/skyrim/cfr.c
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <boot/coreboot_tables.h>
+#include <drivers/option/cfr_frontend.h>
+#include <ec/google/chromeec/cfr.h>
+
+static struct sm_obj_form ec = {
+	.ui_name = "ChromeEC Embedded Controller",
+	.obj_list = (const struct sm_object *[]) {
+		&ec_kb_backlight,
+		&auto_fan_control,
+		NULL
+	},
+};
+
+static struct sm_obj_form *sm_root[] = {
+	&ec,
+	NULL
+};
+
+void mb_cfr_setup_menu(struct lb_cfr *cfr_root)
+{
+	cfr_write_setup_menu(cfr_root, sm_root);
+}