10 files changed, 20 insertions, 24 deletions
diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig
index c46b979ead..a651b57fc7 100644
--- a/src/mainboard/gigabyte/Kconfig
+++ b/src/mainboard/gigabyte/Kconfig
@@ -21,33 +21,11 @@ if VENDOR_GIGABYTE
 choice
 	prompt "Mainboard model"
 
-config BOARD_GIGABYTE_GA_2761GXDK
-	bool "GA-2761GXDK"
-config BOARD_GIGABYTE_GA_6BXC
-	bool "GA-6BXC"
-config BOARD_GIGABYTE_GA_6BXE
-	bool "GA-6BXE"
-config BOARD_GIGABYTE_GA_B75M_D3H
-	bool "GA-B75M-D3H"
-config BOARD_GIGABYTE_M57SLI
-	bool "GA-M57SLI-S4"
-config BOARD_GIGABYTE_MA785GMT
-	bool "GA-MA785GMT-UD2H"
-config BOARD_GIGABYTE_MA785GM
-	bool "GA-MA785GM-US2H"
-config BOARD_GIGABYTE_MA78GM
-	bool "GA-MA78GM-US2H"
+source "src/mainboard/gigabyte/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/gigabyte/ga_2761gxdk/Kconfig"
-source "src/mainboard/gigabyte/ga-6bxc/Kconfig"
-source "src/mainboard/gigabyte/ga-6bxe/Kconfig"
-source "src/mainboard/gigabyte/ga-b75m-d3h/Kconfig"
-source "src/mainboard/gigabyte/m57sli/Kconfig"
-source "src/mainboard/gigabyte/ma785gmt/Kconfig"
-source "src/mainboard/gigabyte/ma785gm/Kconfig"
-source "src/mainboard/gigabyte/ma78gm/Kconfig"
+source "src/mainboard/gigabyte/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/gigabyte/Kconfig.name b/src/mainboard/gigabyte/Kconfig.name
new file mode 100644
index 0000000000..d98df3e409
--- /dev/null
+++ b/src/mainboard/gigabyte/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_GIGABYTE
+	bool "GIGABYTE"
diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig.name b/src/mainboard/gigabyte/ga-6bxc/Kconfig.name
new file mode 100644
index 0000000000..4fb58428c6
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_GA_6BXC
+	bool "GA-6BXC"
diff --git a/src/mainboard/gigabyte/ga-6bxe/Kconfig.name b/src/mainboard/gigabyte/ga-6bxe/Kconfig.name
new file mode 100644
index 0000000000..0912807ab9
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-6bxe/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_GA_6BXE
+	bool "GA-6BXE"
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name
new file mode 100644
index 0000000000..571f6d1647
--- /dev/null
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_GA_B75M_D3H
+	bool "GA-B75M-D3H"
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig.name b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig.name
new file mode 100644
index 0000000000..435f1a6afe
--- /dev/null
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_GA_2761GXDK
+	bool "GA-2761GXDK"
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig.name b/src/mainboard/gigabyte/m57sli/Kconfig.name
new file mode 100644
index 0000000000..32a5470fb8
--- /dev/null
+++ b/src/mainboard/gigabyte/m57sli/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_M57SLI
+	bool "GA-M57SLI-S4"
diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig.name b/src/mainboard/gigabyte/ma785gm/Kconfig.name
new file mode 100644
index 0000000000..79555faad5
--- /dev/null
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_MA785GM
+	bool "GA-MA785GM-US2H"
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig.name b/src/mainboard/gigabyte/ma785gmt/Kconfig.name
new file mode 100644
index 0000000000..4700e2d5a4
--- /dev/null
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_MA785GMT
+	bool "GA-MA785GMT-UD2H"
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig.name b/src/mainboard/gigabyte/ma78gm/Kconfig.name
new file mode 100644
index 0000000000..5b21fdef4a
--- /dev/null
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_MA78GM
+	bool "GA-MA78GM-US2H"