diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 3078224cc9..1ba172e687 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -10,6 +10,7 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	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/octopus/Makefile.mk b/src/mainboard/google/octopus/Makefile.mk
index accb4633f3..7633d79606 100644
--- a/src/mainboard/google/octopus/Makefile.mk
+++ b/src/mainboard/google/octopus/Makefile.mk
@@ -5,6 +5,7 @@ bootblock-y += ec.c
 
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
 
+ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-y += ec.c
 ramstage-y += mainboard.c
diff --git a/src/mainboard/google/octopus/cfr.c b/src/mainboard/google/octopus/cfr.c
new file mode 100644
index 0000000000..bedb686b4e
--- /dev/null
+++ b/src/mainboard/google/octopus/cfr.c
@@ -0,0 +1,42 @@
+/* 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 *[]) {
+		&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 *[]) {
+		&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);
+}