diff --git a/src/mainboard/clevo/kbl-u/Kconfig b/src/mainboard/clevo/kbl-u/Kconfig
index ed0600a018..1229fa4b3e 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig
+++ b/src/mainboard/clevo/kbl-u/Kconfig
@@ -1,9 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-if BOARD_CLEVO_N130WU
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_CLEVO_KBLU_COMMON
+	def_bool n
 	select BOARD_ROMSIZE_KB_8192
 	select EC_ACPI
 	select HAVE_ACPI_RESUME
@@ -21,6 +19,12 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPD_READ_BY_WORD
 	select SYSTEM_TYPE_LAPTOP
 
+config BOARD_CLEVO_N130WU_OPTIONS
+	bool
+	select BOARD_CLEVO_KBLU_COMMON
+
+if BOARD_CLEVO_KBLU_COMMON
+
 config VBOOT
 	select VBOOT_NO_BOARD_SUPPORT
 	select GBB_FLAG_DISABLE_LID_SHUTDOWN
diff --git a/src/mainboard/clevo/kbl-u/Kconfig.name b/src/mainboard/clevo/kbl-u/Kconfig.name
index 5a6f699c67..05a49cda7c 100644
--- a/src/mainboard/clevo/kbl-u/Kconfig.name
+++ b/src/mainboard/clevo/kbl-u/Kconfig.name
@@ -4,3 +4,4 @@ comment "Kaby Lake U"
 
 config BOARD_CLEVO_N130WU
 	bool "N130WU / N131WU"
+	select BOARD_CLEVO_N130WU_OPTIONS