diff --git a/src/mainboard/lenovo/x220/cfr.c b/src/mainboard/lenovo/x220/cfr.c
index 2ebfd32d77..e37464a07a 100644
--- a/src/mainboard/lenovo/x220/cfr.c
+++ b/src/mainboard/lenovo/x220/cfr.c
@@ -1,4 +1,3 @@
-
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <boot/coreboot_tables.h>
@@ -8,12 +7,12 @@
 #include <northbridge/intel/sandybridge/cfr.h>
 #include <southbridge/intel/bd82x6x/cfr.h>
 
-GEN_RP_ENUM(1, "Wifi")
+DEFINE_RP_ENABLE_OPTION(1, "Wi-Fi");
 #if CONFIG(BOARD_LENOVO_X220)
-GEN_RP_ENUM(3, "ExpressCard")
+DEFINE_RP_ENABLE_OPTION(3, "ExpressCard");
 #endif
-GEN_RP_ENUM(4, "SD Card Reader")
-GEN_RP_ENUM(6, "xHCI")
+DEFINE_RP_ENABLE_OPTION(4, "SD Card Reader");
+DEFINE_RP_ENABLE_OPTION(6, "xHCI");
 
 static struct sm_obj_form pcie = {
 	.ui_name = "PCH PCIe",
diff --git a/src/southbridge/intel/bd82x6x/cfr.h b/src/southbridge/intel/bd82x6x/cfr.h
index d70650463a..064636d6b5 100644
--- a/src/southbridge/intel/bd82x6x/cfr.h
+++ b/src/southbridge/intel/bd82x6x/cfr.h
@@ -11,17 +11,13 @@
 #include <southbridge/intel/common/pmutil.h>
 #include "me.h"
 
-#define GEN_RP_ENUM(x, y)					\
-static const struct sm_object pcie_rp##x = SM_DECLARE_ENUM({	\
-	.opt_name	= "pch_pcie_enable_rp"#x,		\
-	.ui_name	= y,					\
-	.ui_helptext	= "Enable or disable "#y,		\
-	.default_value	= 1,					\
-	.values		= (const struct sm_enum_value[]) {	\
-		{ "Disabled",	0	},			\
-		{ "Enabled",	1	},			\
-		SM_ENUM_VALUE_END	},			\
-});
+#define DEFINE_RP_ENABLE_OPTION(_rp, _name)			\
+static const struct sm_object pcie_rp##_rp = SM_DECLARE_BOOL({	\
+	.opt_name	= "pch_pcie_enable_rp"#_rp,		\
+	.ui_name	= _name,				\
+	.ui_helptext	= "Enable or disable "#_name,		\
+	.default_value	= true,					\
+})
 
 /* Power state after power loss */
 static const struct sm_object power_on_after_fail = SM_DECLARE_ENUM({