5 files changed, 10 insertions, 9 deletions
diff --git a/src/mainboard/iwill/Kconfig b/src/mainboard/iwill/Kconfig
index c520138818..75fa626b60 100644
--- a/src/mainboard/iwill/Kconfig
+++ b/src/mainboard/iwill/Kconfig
@@ -3,18 +3,11 @@ if VENDOR_IWILL
 choice
 	prompt "Mainboard model"
 
-config BOARD_IWILL_DK8_HTX
-	bool "DK8-HTX"
-config BOARD_IWILL_DK8S2
-	bool "DK8S2"
-config BOARD_IWILL_DK8X
-	bool "DK8X"
+source "src/mainboard/iwill/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/iwill/dk8_htx/Kconfig"
-source "src/mainboard/iwill/dk8s2/Kconfig"
-source "src/mainboard/iwill/dk8x/Kconfig"
+source "src/mainboard/iwill/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/iwill/Kconfig.name b/src/mainboard/iwill/Kconfig.name
new file mode 100644
index 0000000000..026608bec6
--- /dev/null
+++ b/src/mainboard/iwill/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_IWILL
+	bool "IWILL"
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig.name b/src/mainboard/iwill/dk8_htx/Kconfig.name
new file mode 100644
index 0000000000..8d81fc199d
--- /dev/null
+++ b/src/mainboard/iwill/dk8_htx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IWILL_DK8_HTX
+	bool "DK8-HTX"
diff --git a/src/mainboard/iwill/dk8s2/Kconfig.name b/src/mainboard/iwill/dk8s2/Kconfig.name
new file mode 100644
index 0000000000..ff5a685ffd
--- /dev/null
+++ b/src/mainboard/iwill/dk8s2/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IWILL_DK8S2
+	bool "DK8S2"
diff --git a/src/mainboard/iwill/dk8x/Kconfig.name b/src/mainboard/iwill/dk8x/Kconfig.name
new file mode 100644
index 0000000000..a474a76516
--- /dev/null
+++ b/src/mainboard/iwill/dk8x/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IWILL_DK8X
+	bool "DK8X"