2 files changed, 19 insertions, 13 deletions
diff --git a/src/mainboard/purism/librem_cnl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index 45bbdc2a28..0c17ec967c 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -13,6 +13,25 @@ config BOARD_PURISM_BASEBOARD_LIBREM_CNL
 	select SPD_READ_BY_WORD
 	select USE_LEGACY_8254_TIMER
 
+config BOARD_PURISM_LIBREM_MINI
+	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+	select SOC_INTEL_WHISKEYLAKE
+	select SUPERIO_ITE_IT8528E
+
+config BOARD_PURISM_LIBREM_MINI_V2
+	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+	select SOC_INTEL_COMETLAKE_1
+	select SUPERIO_ITE_IT8528E
+
+config BOARD_PURISM_LIBREM_14
+	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
+	select DRIVERS_I2C_HID
+	select EC_LIBREM_EC
+	select MEMORY_MAPPED_TPM
+	select MAINBOARD_HAS_TPM1
+	select SOC_INTEL_COMETLAKE_1
+	select SYSTEM_TYPE_LAPTOP
+
 if BOARD_PURISM_BASEBOARD_LIBREM_CNL
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/purism/librem_cnl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name
index a575e44e04..1a649a2bcd 100644
--- a/src/mainboard/purism/librem_cnl/Kconfig.name
+++ b/src/mainboard/purism/librem_cnl/Kconfig.name
@@ -1,21 +1,8 @@
 config BOARD_PURISM_LIBREM_MINI
 	bool "Librem Mini"
-	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
-	select SOC_INTEL_WHISKEYLAKE
-	select SUPERIO_ITE_IT8528E
 
 config BOARD_PURISM_LIBREM_MINI_V2
 	bool "Librem Mini v2"
-	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
-	select SOC_INTEL_COMETLAKE_1
-	select SUPERIO_ITE_IT8528E
 
 config BOARD_PURISM_LIBREM_14
 	bool "Librem 14"
-	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
-	select DRIVERS_I2C_HID
-	select EC_LIBREM_EC
-	select MEMORY_MAPPED_TPM
-	select MAINBOARD_HAS_TPM1
-	select SOC_INTEL_COMETLAKE_1
-	select SYSTEM_TYPE_LAPTOP