2 files changed, 11 insertions, 6 deletions
diff --git a/src/mainboard/clevo/cml-u/Kconfig b/src/mainboard/clevo/cml-u/Kconfig
index 39b617fbdd..f8bf1bac40 100644
--- a/src/mainboard/clevo/cml-u/Kconfig
+++ b/src/mainboard/clevo/cml-u/Kconfig
@@ -1,16 +1,12 @@
-if BOARD_CLEVO_L140CU
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_CLEVO_CMLU_COMMON
+	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_I2C_HID
-	select EC_SYSTEM76_EC
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_CMOS_DEFAULT
 	select HAVE_OPTION_TABLE
 	select HAVE_SMI_HANDLER
-	select HAVE_SPD_IN_CBFS
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_LPSS_UART_FOR_CONSOLE
 	select MAINBOARD_HAS_LIBGFXINIT
@@ -22,6 +18,14 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPD_READ_BY_WORD
 	select SYSTEM_TYPE_LAPTOP
 
+config BOARD_CLEVO_L140CU_OPTIONS
+	bool
+	select BOARD_CLEVO_CMLU_COMMON
+	select EC_SYSTEM76_EC
+	select HAVE_SPD_IN_CBFS
+
+if BOARD_CLEVO_CMLU_COMMON
+
 config MAINBOARD_DIR
 	string
 	default "clevo/cml-u"
diff --git a/src/mainboard/clevo/cml-u/Kconfig.name b/src/mainboard/clevo/cml-u/Kconfig.name
index f8f22cc531..92555ffd95 100644
--- a/src/mainboard/clevo/cml-u/Kconfig.name
+++ b/src/mainboard/clevo/cml-u/Kconfig.name
@@ -2,3 +2,4 @@ comment "Comet Lake U"
 
 config BOARD_CLEVO_L140CU
 	bool "L140CU / L141CU"
+	select BOARD_CLEVO_L140CU_OPTIONS