diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index 610bfbb..d7cdc3d 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -4,204 +4,11 @@
 	prompt "Mainboard vendor"
 	default VENDOR_EMULATION
 
-config VENDOR_AAEON
-	bool "Aaeon"
-config VENDOR_ABIT
-	bool "Abit"
-config VENDOR_ADLINK
-	bool "ADLINK"
-config VENDOR_ADVANSUS
-	bool "Advansus"
-config VENDOR_AMD
-	bool "AMD"
-config VENDOR_AOPEN
-	bool "AOpen"
-config VENDOR_APPLE
-	bool "Apple"
-config VENDOR_ARIMA
-	bool "Arima"
-config VENDOR_ARTECGROUP
-	bool "Artec Group"
-config VENDOR_ASROCK
-	bool "ASROCK"
-config VENDOR_ASUS
-	bool "ASUS"
-config VENDOR_A_TREND
-	bool "A-Trend"
-config VENDOR_AVALUE
-	bool "AVALUE"
-config VENDOR_AZZA
-	bool "AZZA"
-config VENDOR_BACHMANN
-	bool "Bachmann electronic"
-config VENDOR_BCOM
-	bool "BCOM"
-config VENDOR_BIFFEROS
-	bool "Bifferos"
-config VENDOR_BIOSTAR
-	bool "Biostar"
-config VENDOR_BROADCOM
-	bool "Broadcom"
-config VENDOR_COMPAQ
-	bool "Compaq"
-config VENDOR_CUBIETECH
-	bool "Cubietech"
-config VENDOR_DIGITALLOGIC
-	bool "DIGITAL-LOGIC"
-config VENDOR_DMP
-	bool "DMP"
-config VENDOR_ECS
-	bool "ECS"
-config VENDOR_EMULATION
-	bool "Emulation"
-config VENDOR_GETAC
-	bool "Getac"
-config VENDOR_GIGABYTE
-	bool "GIGABYTE"
-config VENDOR_GIZMOSPHERE
-	bool "GizmoSphere"
-config VENDOR_GOOGLE
-	bool "Google"
-config VENDOR_HP
-	bool "HP"
-config VENDOR_IBASE
-	bool "iBase"
-config VENDOR_IBM
-	bool "IBM"
-config VENDOR_IEI
-	bool "IEI"
-config VENDOR_INTEL
-	bool "Intel"
-config VENDOR_IWAVE
-	bool "iWave"
-config VENDOR_IWILL
-	bool "IWILL"
-config VENDOR_JETWAY
-	bool "Jetway"
-config VENDOR_KONTRON
-	bool "Kontron"
-config VENDOR_LANNER
-	bool "Lanner"
-config VENDOR_LENOVO
-	bool "Lenovo"
-config VENDOR_LINUTOP
-	bool "Linutop"
-config VENDOR_LIPPERT
-	bool "LiPPERT"
-config VENDOR_MITAC
-	bool "Mitac"
-config VENDOR_MSI
-	bool "MSI"
-config VENDOR_NEC
-	bool "NEC"
-config VENDOR_NEWISYS
-	bool "Newisys"
-config VENDOR_NOKIA
-	bool "Nokia"
-config VENDOR_NVIDIA
-	bool "NVIDIA"
-config VENDOR_PACKARDBELL
-	bool "Packard Bell"
-config VENDOR_PCENGINES
-	bool "PC Engines"
-config VENDOR_RCA
-	bool "RCA"
-config VENDOR_RODA
-	bool "Roda"
-config VENDOR_SAMSUNG
-	bool "SAMSUNG"
-config VENDOR_SIEMENS
-	bool "Siemens"
-config VENDOR_SOYO
-	bool "Soyo"
-config VENDOR_SUNW
-	bool "Sun"
-config VENDOR_SUPERMICRO
-	bool "Supermicro"
-config VENDOR_TECHNEXION
-	bool "Technexion"
-config VENDOR_TI
-	bool "TI"
-config VENDOR_THOMSON
-	bool "Thomson"
-config VENDOR_TRAVERSE
-	bool "Traverse Technologies"
-config VENDOR_TYAN
-	bool "Tyan"
-config VENDOR_VIA
-	bool "VIA"
-config VENDOR_WINENT
-	bool "Win Enterprises"
-config VENDOR_WYSE
-	bool "Wyse"
+source "src/mainboard/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/a-trend/Kconfig"
-source "src/mainboard/aaeon/Kconfig"
-source "src/mainboard/abit/Kconfig"
-source "src/mainboard/adlink/Kconfig"
-source "src/mainboard/advansus/Kconfig"
-source "src/mainboard/amd/Kconfig"
-source "src/mainboard/aopen/Kconfig"
-source "src/mainboard/apple/Kconfig"
-source "src/mainboard/arima/Kconfig"
-source "src/mainboard/artecgroup/Kconfig"
-source "src/mainboard/asrock/Kconfig"
-source "src/mainboard/asus/Kconfig"
-source "src/mainboard/avalue/Kconfig"
-source "src/mainboard/azza/Kconfig"
-source "src/mainboard/bachmann/Kconfig"
-source "src/mainboard/bcom/Kconfig"
-source "src/mainboard/bifferos/Kconfig"
-source "src/mainboard/biostar/Kconfig"
-source "src/mainboard/broadcom/Kconfig"
-source "src/mainboard/compaq/Kconfig"
-source "src/mainboard/cubietech/Kconfig"
-source "src/mainboard/digitallogic/Kconfig"
-source "src/mainboard/dmp/Kconfig"
-source "src/mainboard/ecs/Kconfig"
-source "src/mainboard/emulation/Kconfig"
-source "src/mainboard/getac/Kconfig"
-source "src/mainboard/gigabyte/Kconfig"
-source "src/mainboard/gizmosphere/Kconfig"
-source "src/mainboard/google/Kconfig"
-source "src/mainboard/hp/Kconfig"
-source "src/mainboard/ibase/Kconfig"
-source "src/mainboard/ibm/Kconfig"
-source "src/mainboard/iei/Kconfig"
-source "src/mainboard/intel/Kconfig"
-source "src/mainboard/iwave/Kconfig"
-source "src/mainboard/iwill/Kconfig"
-source "src/mainboard/jetway/Kconfig"
-source "src/mainboard/kontron/Kconfig"
-source "src/mainboard/lanner/Kconfig"
-source "src/mainboard/lenovo/Kconfig"
-source "src/mainboard/linutop/Kconfig"
-source "src/mainboard/lippert/Kconfig"
-source "src/mainboard/mitac/Kconfig"
-source "src/mainboard/msi/Kconfig"
-source "src/mainboard/nec/Kconfig"
-source "src/mainboard/newisys/Kconfig"
-source "src/mainboard/nokia/Kconfig"
-source "src/mainboard/nvidia/Kconfig"
-source "src/mainboard/packardbell/Kconfig"
-source "src/mainboard/pcengines/Kconfig"
-source "src/mainboard/rca/Kconfig"
-source "src/mainboard/roda/Kconfig"
-source "src/mainboard/samsung/Kconfig"
-source "src/mainboard/siemens/Kconfig"
-source "src/mainboard/soyo/Kconfig"
-source "src/mainboard/sunw/Kconfig"
-source "src/mainboard/supermicro/Kconfig"
-source "src/mainboard/technexion/Kconfig"
-source "src/mainboard/thomson/Kconfig"
-source "src/mainboard/ti/Kconfig"
-source "src/mainboard/traverse/Kconfig"
-source "src/mainboard/tyan/Kconfig"
-source "src/mainboard/via/Kconfig"
-source "src/mainboard/winent/Kconfig"
-source "src/mainboard/wyse/Kconfig"
+source "src/mainboard/*/Kconfig"
 
 config BOARD_ROMSIZE_KB_64
 	bool
diff --git a/src/mainboard/a-trend/Kconfig b/src/mainboard/a-trend/Kconfig
index 88232e1..4a01b61 100644
--- a/src/mainboard/a-trend/Kconfig
+++ b/src/mainboard/a-trend/Kconfig
@@ -21,15 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_A_TREND_ATC_6220
-	bool "ATC-6220"
-config BOARD_A_TREND_ATC_6240
-	bool "ATC-6240"
+source "src/mainboard/a-trend/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/a-trend/atc-6220/Kconfig"
-source "src/mainboard/a-trend/atc-6240/Kconfig"
+source "src/mainboard/a-trend/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/a-trend/Kconfig.name b/src/mainboard/a-trend/Kconfig.name
new file mode 100644
index 0000000..d7e2287
--- /dev/null
+++ b/src/mainboard/a-trend/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_A_TREND
+	bool "A-Trend"
diff --git a/src/mainboard/a-trend/atc-6220/Kconfig.name b/src/mainboard/a-trend/atc-6220/Kconfig.name
new file mode 100644
index 0000000..06fead5
--- /dev/null
+++ b/src/mainboard/a-trend/atc-6220/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_A_TREND_ATC_6220
+	bool "ATC-6220"
diff --git a/src/mainboard/a-trend/atc-6240/Kconfig.name b/src/mainboard/a-trend/atc-6240/Kconfig.name
new file mode 100644
index 0000000..e80b712
--- /dev/null
+++ b/src/mainboard/a-trend/atc-6240/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_A_TREND_ATC_6240
+	bool "ATC-6240"
diff --git a/src/mainboard/aaeon/Kconfig b/src/mainboard/aaeon/Kconfig
index d335938..a60a4c5 100644
--- a/src/mainboard/aaeon/Kconfig
+++ b/src/mainboard/aaeon/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_AAEON_PFM_540I_REVB
-	bool "PFM-540I_REVB"
+source "src/mainboard/aaeon/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/aaeon/pfm-540i_revb/Kconfig"
+source "src/mainboard/aaeon/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/aaeon/Kconfig.name b/src/mainboard/aaeon/Kconfig.name
new file mode 100644
index 0000000..5a4e51e
--- /dev/null
+++ b/src/mainboard/aaeon/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_AAEON
+	bool "Aaeon"
diff --git a/src/mainboard/aaeon/pfm-540i_revb/Kconfig.name b/src/mainboard/aaeon/pfm-540i_revb/Kconfig.name
new file mode 100644
index 0000000..beaf0e7
--- /dev/null
+++ b/src/mainboard/aaeon/pfm-540i_revb/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AAEON_PFM_540I_REVB
+	bool "PFM-540I_REVB"
diff --git a/src/mainboard/abit/Kconfig b/src/mainboard/abit/Kconfig
index 6a72054..eb02228 100644
--- a/src/mainboard/abit/Kconfig
+++ b/src/mainboard/abit/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ABIT_BE6_II_V2_0
-	bool "BE6-II V2.0"
+source "src/mainboard/abit/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/abit/be6-ii_v2_0/Kconfig"
+source "src/mainboard/abit/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/abit/Kconfig.name b/src/mainboard/abit/Kconfig.name
new file mode 100644
index 0000000..385be00
--- /dev/null
+++ b/src/mainboard/abit/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ABIT
+	bool "Abit"
diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig.name b/src/mainboard/abit/be6-ii_v2_0/Kconfig.name
new file mode 100644
index 0000000..79d2bd1
--- /dev/null
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ABIT_BE6_II_V2_0
+	bool "BE6-II V2.0"
diff --git a/src/mainboard/adlink/Kconfig.name b/src/mainboard/adlink/Kconfig.name
new file mode 100644
index 0000000..fb8d433
--- /dev/null
+++ b/src/mainboard/adlink/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ADLINK
+	bool "ADLINK"
diff --git a/src/mainboard/advansus/Kconfig b/src/mainboard/advansus/Kconfig
index 956d14d..0ee693b 100644
--- a/src/mainboard/advansus/Kconfig
+++ b/src/mainboard/advansus/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ADVANSUS_A785E_I
-	bool "A785E-I"
+source "src/mainboard/advansus/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/advansus/a785e-i/Kconfig"
+source "src/mainboard/advansus/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/advansus/Kconfig.name b/src/mainboard/advansus/Kconfig.name
new file mode 100644
index 0000000..f610ef9
--- /dev/null
+++ b/src/mainboard/advansus/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ADVANSUS
+	bool "Advansus"
diff --git a/src/mainboard/advansus/a785e-i/Kconfig.name b/src/mainboard/advansus/a785e-i/Kconfig.name
new file mode 100644
index 0000000..8e15765
--- /dev/null
+++ b/src/mainboard/advansus/a785e-i/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ADVANSUS_A785E_I
+	bool "A785E-I"
diff --git a/src/mainboard/amd/Kconfig b/src/mainboard/amd/Kconfig
index cc5679a..664ebe10 100644
--- a/src/mainboard/amd/Kconfig
+++ b/src/mainboard/amd/Kconfig
@@ -3,71 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_AMD_DB800
-	bool "DB800 (Salsa)"
-config BOARD_AMD_DBM690T
-	bool "DBM690T (Herring)"
-config BOARD_AMD_DINAR
-	bool "Dinar"
-config BOARD_AMD_MAHOGANY
-	bool "Mahogany"
-config BOARD_AMD_MAHOGANY_FAM10
-	bool "Mahogany (Fam10)"
-config BOARD_AMD_NORWICH
-	bool "Norwich"
-config BOARD_AMD_PISTACHIO
-	bool "Pistachio"
-config BOARD_AMD_RUMBA
-	bool "Rumba"
-config BOARD_AMD_SERENGETI_CHEETAH
-	bool "Serengeti Cheetah"
-config BOARD_AMD_SERENGETI_CHEETAH_FAM10
-	bool "Serengeti Cheetah (Fam10)"
-config BOARD_AMD_TILAPIA_FAM10
-	bool "Tilapia (Fam10)"
-config BOARD_AMD_BIMINI_FAM10
-	bool "Bimini (Fam10)"
-config BOARD_AMD_INAGUA
-	bool "Inagua"
-config BOARD_AMD_PERSIMMON
-	bool "Persimmon"
-config BOARD_AMD_SOUTHSTATION
-	bool "Southstation"
-config BOARD_AMD_TORPEDO
-	bool "Torpedo"
-config BOARD_AMD_UNIONSTATION
-	bool "Unionstation"
-config BOARD_AMD_PARMER
-	bool "Parmer"
-config BOARD_AMD_THATCHER
-	bool "Thatcher"
-config BOARD_AMD_OLIVEHILL
-	bool "Olive Hill"
-config BOARD_AMD_OLIVEHILLPLUS
-	bool "Olive Hill Plus"
+source "src/mainboard/amd/*/Kconfig.name"
+
 endchoice
 
-source "src/mainboard/amd/db800/Kconfig"
-source "src/mainboard/amd/dbm690t/Kconfig"
-source "src/mainboard/amd/dinar/Kconfig"
-source "src/mainboard/amd/mahogany/Kconfig"
-source "src/mainboard/amd/mahogany_fam10/Kconfig"
-source "src/mainboard/amd/norwich/Kconfig"
-source "src/mainboard/amd/pistachio/Kconfig"
-source "src/mainboard/amd/rumba/Kconfig"
-source "src/mainboard/amd/serengeti_cheetah/Kconfig"
-source "src/mainboard/amd/serengeti_cheetah_fam10/Kconfig"
-source "src/mainboard/amd/tilapia_fam10/Kconfig"
-source "src/mainboard/amd/bimini_fam10/Kconfig"
-source "src/mainboard/amd/inagua/Kconfig"
-source "src/mainboard/amd/persimmon/Kconfig"
-source "src/mainboard/amd/south_station/Kconfig"
-source "src/mainboard/amd/torpedo/Kconfig"
-source "src/mainboard/amd/union_station/Kconfig"
-source "src/mainboard/amd/parmer/Kconfig"
-source "src/mainboard/amd/thatcher/Kconfig"
-source "src/mainboard/amd/olivehill/Kconfig"
-source "src/mainboard/amd/olivehillplus/Kconfig"
+source "src/mainboard/amd/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/amd/Kconfig.name b/src/mainboard/amd/Kconfig.name
new file mode 100644
index 0000000..d512a9b
--- /dev/null
+++ b/src/mainboard/amd/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_AMD
+	bool "AMD"
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig.name b/src/mainboard/amd/bimini_fam10/Kconfig.name
new file mode 100644
index 0000000..838265606
--- /dev/null
+++ b/src/mainboard/amd/bimini_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_BIMINI_FAM10
+	bool "Bimini (Fam10)"
diff --git a/src/mainboard/amd/db800/Kconfig.name b/src/mainboard/amd/db800/Kconfig.name
new file mode 100644
index 0000000..486b617
--- /dev/null
+++ b/src/mainboard/amd/db800/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_DB800
+	bool "DB800 (Salsa)"
diff --git a/src/mainboard/amd/dbm690t/Kconfig.name b/src/mainboard/amd/dbm690t/Kconfig.name
new file mode 100644
index 0000000..cbc2900
--- /dev/null
+++ b/src/mainboard/amd/dbm690t/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_DBM690T
+	bool "DBM690T (Herring)"
diff --git a/src/mainboard/amd/dinar/Kconfig.name b/src/mainboard/amd/dinar/Kconfig.name
new file mode 100644
index 0000000..b3434c1
--- /dev/null
+++ b/src/mainboard/amd/dinar/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_DINAR
+	bool "Dinar"
diff --git a/src/mainboard/amd/inagua/Kconfig.name b/src/mainboard/amd/inagua/Kconfig.name
new file mode 100644
index 0000000..668b22a
--- /dev/null
+++ b/src/mainboard/amd/inagua/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_INAGUA
+	bool "Inagua"
diff --git a/src/mainboard/amd/mahogany/Kconfig.name b/src/mainboard/amd/mahogany/Kconfig.name
new file mode 100644
index 0000000..5dde9cb
--- /dev/null
+++ b/src/mainboard/amd/mahogany/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_MAHOGANY
+	bool "Mahogany"
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig.name b/src/mainboard/amd/mahogany_fam10/Kconfig.name
new file mode 100644
index 0000000..c2d42a9
--- /dev/null
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_MAHOGANY_FAM10
+	bool "Mahogany (Fam10)"
diff --git a/src/mainboard/amd/norwich/Kconfig.name b/src/mainboard/amd/norwich/Kconfig.name
new file mode 100644
index 0000000..0d590b1
--- /dev/null
+++ b/src/mainboard/amd/norwich/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_NORWICH
+	bool "Norwich"
diff --git a/src/mainboard/amd/olivehill/Kconfig.name b/src/mainboard/amd/olivehill/Kconfig.name
new file mode 100644
index 0000000..fd1a713
--- /dev/null
+++ b/src/mainboard/amd/olivehill/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_OLIVEHILL
+	bool "Olive Hill"
diff --git a/src/mainboard/amd/olivehillplus/Kconfig.name b/src/mainboard/amd/olivehillplus/Kconfig.name
new file mode 100644
index 0000000..85a3e86
--- /dev/null
+++ b/src/mainboard/amd/olivehillplus/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_OLIVEHILLPLUS
+	bool "Olive Hill Plus"
diff --git a/src/mainboard/amd/parmer/Kconfig.name b/src/mainboard/amd/parmer/Kconfig.name
new file mode 100644
index 0000000..3aedc95
--- /dev/null
+++ b/src/mainboard/amd/parmer/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_PARMER
+	bool "Parmer"
diff --git a/src/mainboard/amd/persimmon/Kconfig.name b/src/mainboard/amd/persimmon/Kconfig.name
new file mode 100644
index 0000000..ba24b13a
--- /dev/null
+++ b/src/mainboard/amd/persimmon/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_PERSIMMON
+	bool "Persimmon"
diff --git a/src/mainboard/amd/pistachio/Kconfig.name b/src/mainboard/amd/pistachio/Kconfig.name
new file mode 100644
index 0000000..bbab2bf
--- /dev/null
+++ b/src/mainboard/amd/pistachio/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_PISTACHIO
+	bool "Pistachio"
diff --git a/src/mainboard/amd/rumba/Kconfig.name b/src/mainboard/amd/rumba/Kconfig.name
new file mode 100644
index 0000000..e00444e
--- /dev/null
+++ b/src/mainboard/amd/rumba/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_RUMBA
+	bool "Rumba"
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig.name b/src/mainboard/amd/serengeti_cheetah/Kconfig.name
new file mode 100644
index 0000000..8a15a9b
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_SERENGETI_CHEETAH
+	bool "Serengeti Cheetah"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig.name b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig.name
new file mode 100644
index 0000000..66b7c39
--- /dev/null
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_SERENGETI_CHEETAH_FAM10
+	bool "Serengeti Cheetah (Fam10)"
diff --git a/src/mainboard/amd/south_station/Kconfig.name b/src/mainboard/amd/south_station/Kconfig.name
new file mode 100644
index 0000000..0cc745e
--- /dev/null
+++ b/src/mainboard/amd/south_station/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_SOUTHSTATION
+	bool "Southstation"
diff --git a/src/mainboard/amd/thatcher/Kconfig.name b/src/mainboard/amd/thatcher/Kconfig.name
new file mode 100644
index 0000000..aff5246
--- /dev/null
+++ b/src/mainboard/amd/thatcher/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_THATCHER
+	bool "Thatcher"
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig.name b/src/mainboard/amd/tilapia_fam10/Kconfig.name
new file mode 100644
index 0000000..6e290c1
--- /dev/null
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_TILAPIA_FAM10
+	bool "Tilapia (Fam10)"
diff --git a/src/mainboard/amd/torpedo/Kconfig.name b/src/mainboard/amd/torpedo/Kconfig.name
new file mode 100644
index 0000000..066ff63
--- /dev/null
+++ b/src/mainboard/amd/torpedo/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_TORPEDO
+	bool "Torpedo"
diff --git a/src/mainboard/amd/union_station/Kconfig.name b/src/mainboard/amd/union_station/Kconfig.name
new file mode 100644
index 0000000..9af3c82
--- /dev/null
+++ b/src/mainboard/amd/union_station/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AMD_UNIONSTATION
+	bool "Unionstation"
diff --git a/src/mainboard/aopen/Kconfig b/src/mainboard/aopen/Kconfig
index b0fc66b..7ea4e54 100644
--- a/src/mainboard/aopen/Kconfig
+++ b/src/mainboard/aopen/Kconfig
@@ -3,12 +3,11 @@
 choice
         prompt "Mainboard model"
 
-config BOARD_AOPEN_DXPLPLUSU
-	bool "DXPL Plus-U"
+source "src/mainboard/aopen/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/aopen/dxplplusu/Kconfig"
+source "src/mainboard/aopen/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/aopen/Kconfig.name b/src/mainboard/aopen/Kconfig.name
new file mode 100644
index 0000000..01ea2b6
--- /dev/null
+++ b/src/mainboard/aopen/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_AOPEN
+	bool "AOpen"
diff --git a/src/mainboard/aopen/dxplplusu/Kconfig.name b/src/mainboard/aopen/dxplplusu/Kconfig.name
new file mode 100644
index 0000000..1310203
--- /dev/null
+++ b/src/mainboard/aopen/dxplplusu/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AOPEN_DXPLPLUSU
+	bool "DXPL Plus-U"
diff --git a/src/mainboard/apple/Kconfig b/src/mainboard/apple/Kconfig
index 7d3e8c2..0f5e964 100644
--- a/src/mainboard/apple/Kconfig
+++ b/src/mainboard/apple/Kconfig
@@ -3,20 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_APPLE_MACBOOK11
-	bool "Macbook1,1"
-	help
-	  Consult wiki for details.
-
-config BOARD_APPLE_MACBOOK21
-	bool "Macbook2,1"
-	help
-	  Consult wiki for details.
+source "src/mainboard/apple/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/apple/macbook11/Kconfig"
-source "src/mainboard/apple/macbook21/Kconfig"
+source "src/mainboard/apple/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/apple/Kconfig.name b/src/mainboard/apple/Kconfig.name
new file mode 100644
index 0000000..8bf1eb8
--- /dev/null
+++ b/src/mainboard/apple/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_APPLE
+	bool "Apple"
diff --git a/src/mainboard/apple/macbook11/Kconfig.name b/src/mainboard/apple/macbook11/Kconfig.name
new file mode 100644
index 0000000..d5ab9ae
--- /dev/null
+++ b/src/mainboard/apple/macbook11/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_APPLE_MACBOOK11
+	bool "Macbook1,1"
diff --git a/src/mainboard/apple/macbook21/Kconfig.name b/src/mainboard/apple/macbook21/Kconfig.name
new file mode 100644
index 0000000..034956b
--- /dev/null
+++ b/src/mainboard/apple/macbook21/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_APPLE_MACBOOK21
+	bool "Macbook2,1"
diff --git a/src/mainboard/arima/Kconfig b/src/mainboard/arima/Kconfig
index 5910369..fdab822 100644
--- a/src/mainboard/arima/Kconfig
+++ b/src/mainboard/arima/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ARIMA_HDAMA
-	bool "HDAMA"
+source "src/mainboard/arima/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/arima/hdama/Kconfig"
+source "src/mainboard/arima/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/arima/Kconfig.name b/src/mainboard/arima/Kconfig.name
new file mode 100644
index 0000000..9e18ffb
--- /dev/null
+++ b/src/mainboard/arima/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ARIMA
+	bool "Arima"
diff --git a/src/mainboard/arima/hdama/Kconfig.name b/src/mainboard/arima/hdama/Kconfig.name
new file mode 100644
index 0000000..3f18de8
--- /dev/null
+++ b/src/mainboard/arima/hdama/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ARIMA_HDAMA
+	bool "HDAMA"
diff --git a/src/mainboard/artecgroup/Kconfig b/src/mainboard/artecgroup/Kconfig
index f2d0d32..69804ee 100644
--- a/src/mainboard/artecgroup/Kconfig
+++ b/src/mainboard/artecgroup/Kconfig
@@ -3,8 +3,7 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ARTECGROUP_DBE61
-	bool "DBE61"
+source "src/mainboard/artecgroup/*/Kconfig.name"
 
 endchoice
 
@@ -15,5 +14,5 @@
 endif # VENDOR_ARTECGROUP
 
 if VENDOR_ARTECGROUP || VENDOR_LINUTOP
-source "src/mainboard/artecgroup/dbe61/Kconfig"
+source "src/mainboard/artecgroup/*/Kconfig"
 endif # VENDOR_ARTECGROUP || VENDOR_LINUTOP
diff --git a/src/mainboard/artecgroup/Kconfig.name b/src/mainboard/artecgroup/Kconfig.name
new file mode 100644
index 0000000..7319f9d
--- /dev/null
+++ b/src/mainboard/artecgroup/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ARTECGROUP
+	bool "Artec Group"
diff --git a/src/mainboard/artecgroup/dbe61/Kconfig.name b/src/mainboard/artecgroup/dbe61/Kconfig.name
new file mode 100644
index 0000000..7ebe0df
--- /dev/null
+++ b/src/mainboard/artecgroup/dbe61/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ARTECGROUP_DBE61
+	bool "DBE61"
diff --git a/src/mainboard/asrock/939a785gmh/Kconfig.name b/src/mainboard/asrock/939a785gmh/Kconfig.name
new file mode 100644
index 0000000..2702391
--- /dev/null
+++ b/src/mainboard/asrock/939a785gmh/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASROCK_939A785GMH
+	bool "939A785GMH/128M"
diff --git a/src/mainboard/asrock/Kconfig b/src/mainboard/asrock/Kconfig
index 9b3f63f..9aa52bc 100644
--- a/src/mainboard/asrock/Kconfig
+++ b/src/mainboard/asrock/Kconfig
@@ -21,18 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ASROCK_939A785GMH
-	bool "939A785GMH/128M"
-config BOARD_ASROCK_E350M1
-	bool "E350M1"
-config BOARD_ASROCK_IMB_A180
-	bool "IMB-A180"
+source "src/mainboard/asrock/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/asrock/939a785gmh/Kconfig"
-source "src/mainboard/asrock/e350m1/Kconfig"
-source "src/mainboard/asrock/imb-a180/Kconfig"
+source "src/mainboard/asrock/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/asrock/Kconfig.name b/src/mainboard/asrock/Kconfig.name
new file mode 100644
index 0000000..71fcbc3
--- /dev/null
+++ b/src/mainboard/asrock/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ASROCK
+	bool "ASROCK"
diff --git a/src/mainboard/asrock/e350m1/Kconfig.name b/src/mainboard/asrock/e350m1/Kconfig.name
new file mode 100644
index 0000000..a9a6ec5
--- /dev/null
+++ b/src/mainboard/asrock/e350m1/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASROCK_E350M1
+	bool "E350M1"
diff --git a/src/mainboard/asrock/imb-a180/Kconfig.name b/src/mainboard/asrock/imb-a180/Kconfig.name
new file mode 100644
index 0000000..9680e4d
--- /dev/null
+++ b/src/mainboard/asrock/imb-a180/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASROCK_IMB_A180
+	bool "IMB-A180"
diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig
index 9bc4e35..191ecb3 100644
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -21,80 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ASUS_A8N_E
-	bool "A8N-E"
-config BOARD_ASUS_A8N_SLI
-	bool "A8N-SLI"
-config BOARD_ASUS_A8V_E_SE
-	bool "A8V-E SE"
-config BOARD_ASUS_A8V_E_DELUXE
-	bool "A8V-E Deluxe"
-config BOARD_ASUS_F2A85_M
-	bool "F2A85-M"
-config BOARD_ASUS_F2A85_M_LE
-	bool "F2A85-M LE"
-config BOARD_ASUS_KFSN4_DRE
-	bool "KFSN4-DRE"
-config BOARD_ASUS_K8V_X
-	bool "K8V-X"
-config BOARD_ASUS_M2N_E
-	bool "M2N-E"
-config BOARD_ASUS_M2V
-	bool "M2V"
-config BOARD_ASUS_M2V_MX_SE
-	bool "M2V-MX SE"
-config BOARD_ASUS_M4A785M
-	bool "M4A785-M"
-config BOARD_ASUS_M4A785TM
-	bool "M4A785T-M"
-config BOARD_ASUS_M4A78_EM
-	bool "M4A78-EM"
-config BOARD_ASUS_M5A88_V
-	bool "M5A88-V"
-config BOARD_ASUS_MEW_AM
-	bool "MEW-AM"
-config BOARD_ASUS_MEW_VM
-	bool "MEW-VM"
-config BOARD_ASUS_P2B
-	bool "P2B"
-config BOARD_ASUS_P2B_D
-	bool "P2B-D"
-config BOARD_ASUS_P2B_DS
-	bool "P2B-DS"
-config BOARD_ASUS_P2B_F
-	bool "P2B-F"
-config BOARD_ASUS_P2B_LS
-	bool "P2B-LS"
-config BOARD_ASUS_P3B_F
-	bool "P3B-F"
-config BOARD_ASUS_DSBF
-	bool "DSBF"
+source "src/mainboard/asus/*/Kconfig.name"
+
 endchoice
 
-source "src/mainboard/asus/a8n_e/Kconfig"
-source "src/mainboard/asus/a8n_sli/Kconfig"
-source "src/mainboard/asus/a8v-e_se/Kconfig"
-source "src/mainboard/asus/a8v-e_deluxe/Kconfig"
-source "src/mainboard/asus/f2a85-m/Kconfig"
-source "src/mainboard/asus/f2a85-m_le/Kconfig"
-source "src/mainboard/asus/k8v-x/Kconfig"
-source "src/mainboard/asus/kfsn4-dre/Kconfig"
-source "src/mainboard/asus/m2n-e/Kconfig"
-source "src/mainboard/asus/m2v/Kconfig"
-source "src/mainboard/asus/m2v-mx_se/Kconfig"
-source "src/mainboard/asus/m4a785-m/Kconfig"
-source "src/mainboard/asus/m4a785t-m/Kconfig"
-source "src/mainboard/asus/m4a78-em/Kconfig"
-source "src/mainboard/asus/m5a88-v/Kconfig"
-source "src/mainboard/asus/mew-am/Kconfig"
-source "src/mainboard/asus/mew-vm/Kconfig"
-source "src/mainboard/asus/p2b/Kconfig"
-source "src/mainboard/asus/p2b-d/Kconfig"
-source "src/mainboard/asus/p2b-ds/Kconfig"
-source "src/mainboard/asus/p2b-f/Kconfig"
-source "src/mainboard/asus/p2b-ls/Kconfig"
-source "src/mainboard/asus/p3b-f/Kconfig"
-source "src/mainboard/asus/dsbf/Kconfig"
+source "src/mainboard/asus/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/asus/Kconfig.name b/src/mainboard/asus/Kconfig.name
new file mode 100644
index 0000000..52ef82a
--- /dev/null
+++ b/src/mainboard/asus/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ASUS
+	bool "ASUS"
diff --git a/src/mainboard/asus/a8n_e/Kconfig.name b/src/mainboard/asus/a8n_e/Kconfig.name
new file mode 100644
index 0000000..02b00e7
--- /dev/null
+++ b/src/mainboard/asus/a8n_e/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_A8N_E
+	bool "A8N-E"
diff --git a/src/mainboard/asus/a8n_sli/Kconfig.name b/src/mainboard/asus/a8n_sli/Kconfig.name
new file mode 100644
index 0000000..700bdc2
--- /dev/null
+++ b/src/mainboard/asus/a8n_sli/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_A8N_SLI
+	bool "A8N-SLI"
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig.name b/src/mainboard/asus/a8v-e_deluxe/Kconfig.name
new file mode 100644
index 0000000..c55a1dd
--- /dev/null
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_A8V_E_DELUXE
+	bool "A8V-E Deluxe"
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig.name b/src/mainboard/asus/a8v-e_se/Kconfig.name
new file mode 100644
index 0000000..34afcd8
--- /dev/null
+++ b/src/mainboard/asus/a8v-e_se/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_A8V_E_SE
+	bool "A8V-E SE"
diff --git a/src/mainboard/asus/dsbf/Kconfig.name b/src/mainboard/asus/dsbf/Kconfig.name
new file mode 100644
index 0000000..9bacd4f
--- /dev/null
+++ b/src/mainboard/asus/dsbf/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_DSBF
+	bool "DSBF"
diff --git a/src/mainboard/asus/f2a85-m/Kconfig.name b/src/mainboard/asus/f2a85-m/Kconfig.name
new file mode 100644
index 0000000..af6f628
--- /dev/null
+++ b/src/mainboard/asus/f2a85-m/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_F2A85_M
+	bool "F2A85-M"
diff --git a/src/mainboard/asus/f2a85-m_le/Kconfig.name b/src/mainboard/asus/f2a85-m_le/Kconfig.name
new file mode 100644
index 0000000..2df6565
--- /dev/null
+++ b/src/mainboard/asus/f2a85-m_le/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_F2A85_M_LE
+	bool "F2A85-M LE"
diff --git a/src/mainboard/asus/k8v-x/Kconfig.name b/src/mainboard/asus/k8v-x/Kconfig.name
new file mode 100644
index 0000000..20a4631
--- /dev/null
+++ b/src/mainboard/asus/k8v-x/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_K8V_X
+	bool "K8V-X"
diff --git a/src/mainboard/asus/kfsn4-dre/Kconfig.name b/src/mainboard/asus/kfsn4-dre/Kconfig.name
new file mode 100644
index 0000000..fc25c85
--- /dev/null
+++ b/src/mainboard/asus/kfsn4-dre/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_KFSN4_DRE
+	bool "KFSN4-DRE"
diff --git a/src/mainboard/asus/m2n-e/Kconfig.name b/src/mainboard/asus/m2n-e/Kconfig.name
new file mode 100644
index 0000000..e3cbc5d
--- /dev/null
+++ b/src/mainboard/asus/m2n-e/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M2N_E
+	bool "M2N-E"
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig.name b/src/mainboard/asus/m2v-mx_se/Kconfig.name
new file mode 100644
index 0000000..f15d444
--- /dev/null
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M2V_MX_SE
+	bool "M2V-MX SE"
diff --git a/src/mainboard/asus/m2v/Kconfig.name b/src/mainboard/asus/m2v/Kconfig.name
new file mode 100644
index 0000000..c0fc2f3
--- /dev/null
+++ b/src/mainboard/asus/m2v/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M2V
+	bool "M2V"
diff --git a/src/mainboard/asus/m4a78-em/Kconfig.name b/src/mainboard/asus/m4a78-em/Kconfig.name
new file mode 100644
index 0000000..fdb9254
--- /dev/null
+++ b/src/mainboard/asus/m4a78-em/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M4A78_EM
+	bool "M4A78-EM"
diff --git a/src/mainboard/asus/m4a785-m/Kconfig.name b/src/mainboard/asus/m4a785-m/Kconfig.name
new file mode 100644
index 0000000..1ab150f
--- /dev/null
+++ b/src/mainboard/asus/m4a785-m/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M4A785M
+	bool "M4A785-M"
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig.name b/src/mainboard/asus/m4a785t-m/Kconfig.name
new file mode 100644
index 0000000..cc1669e
--- /dev/null
+++ b/src/mainboard/asus/m4a785t-m/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M4A785TM
+	bool "M4A785T-M"
diff --git a/src/mainboard/asus/m5a88-v/Kconfig.name b/src/mainboard/asus/m5a88-v/Kconfig.name
new file mode 100644
index 0000000..36b49e6
--- /dev/null
+++ b/src/mainboard/asus/m5a88-v/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_M5A88_V
+	bool "M5A88-V"
diff --git a/src/mainboard/asus/mew-am/Kconfig.name b/src/mainboard/asus/mew-am/Kconfig.name
new file mode 100644
index 0000000..819e73bf
--- /dev/null
+++ b/src/mainboard/asus/mew-am/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_MEW_AM
+	bool "MEW-AM"
diff --git a/src/mainboard/asus/mew-vm/Kconfig.name b/src/mainboard/asus/mew-vm/Kconfig.name
new file mode 100644
index 0000000..4966679
--- /dev/null
+++ b/src/mainboard/asus/mew-vm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_MEW_VM
+	bool "MEW-VM"
diff --git a/src/mainboard/asus/p2b-d/Kconfig.name b/src/mainboard/asus/p2b-d/Kconfig.name
new file mode 100644
index 0000000..23e7808
--- /dev/null
+++ b/src/mainboard/asus/p2b-d/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_P2B_D
+	bool "P2B-D"
diff --git a/src/mainboard/asus/p2b-ds/Kconfig.name b/src/mainboard/asus/p2b-ds/Kconfig.name
new file mode 100644
index 0000000..0335139
--- /dev/null
+++ b/src/mainboard/asus/p2b-ds/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_P2B_DS
+	bool "P2B-DS"
diff --git a/src/mainboard/asus/p2b-f/Kconfig.name b/src/mainboard/asus/p2b-f/Kconfig.name
new file mode 100644
index 0000000..a433376
--- /dev/null
+++ b/src/mainboard/asus/p2b-f/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_P2B_F
+	bool "P2B-F"
diff --git a/src/mainboard/asus/p2b-ls/Kconfig.name b/src/mainboard/asus/p2b-ls/Kconfig.name
new file mode 100644
index 0000000..0ad0f47
--- /dev/null
+++ b/src/mainboard/asus/p2b-ls/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_P2B_LS
+	bool "P2B-LS"
diff --git a/src/mainboard/asus/p2b/Kconfig.name b/src/mainboard/asus/p2b/Kconfig.name
new file mode 100644
index 0000000..60d6028
--- /dev/null
+++ b/src/mainboard/asus/p2b/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_P2B
+	bool "P2B"
diff --git a/src/mainboard/asus/p3b-f/Kconfig.name b/src/mainboard/asus/p3b-f/Kconfig.name
new file mode 100644
index 0000000..cf1d9b5
--- /dev/null
+++ b/src/mainboard/asus/p3b-f/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ASUS_P3B_F
+	bool "P3B-F"
diff --git a/src/mainboard/avalue/Kconfig b/src/mainboard/avalue/Kconfig
index 72ed2bb..d2e3783 100644
--- a/src/mainboard/avalue/Kconfig
+++ b/src/mainboard/avalue/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_AVALUE_EAX_785E
-	bool "EAX-785E"
+source "src/mainboard/avalue/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/avalue/eax-785e/Kconfig"
+source "src/mainboard/avalue/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/avalue/Kconfig.name b/src/mainboard/avalue/Kconfig.name
new file mode 100644
index 0000000..27c5511
--- /dev/null
+++ b/src/mainboard/avalue/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_AVALUE
+	bool "AVALUE"
diff --git a/src/mainboard/avalue/eax-785e/Kconfig.name b/src/mainboard/avalue/eax-785e/Kconfig.name
new file mode 100644
index 0000000..dab8b86
--- /dev/null
+++ b/src/mainboard/avalue/eax-785e/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AVALUE_EAX_785E
+	bool "EAX-785E"
diff --git a/src/mainboard/azza/Kconfig b/src/mainboard/azza/Kconfig
index b6488cd..581462d 100644
--- a/src/mainboard/azza/Kconfig
+++ b/src/mainboard/azza/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_AZZA_PT_6IBD
-	bool "PT-6IBD"
+source "src/mainboard/azza/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/azza/pt-6ibd/Kconfig"
+source "src/mainboard/azza/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/azza/Kconfig.name b/src/mainboard/azza/Kconfig.name
new file mode 100644
index 0000000..0b6401d
--- /dev/null
+++ b/src/mainboard/azza/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_AZZA
+	bool "AZZA"
diff --git a/src/mainboard/azza/pt-6ibd/Kconfig.name b/src/mainboard/azza/pt-6ibd/Kconfig.name
new file mode 100644
index 0000000..4a2541c
--- /dev/null
+++ b/src/mainboard/azza/pt-6ibd/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_AZZA_PT_6IBD
+	bool "PT-6IBD"
diff --git a/src/mainboard/bachmann/Kconfig b/src/mainboard/bachmann/Kconfig
index ee61049..27831d1 100644
--- a/src/mainboard/bachmann/Kconfig
+++ b/src/mainboard/bachmann/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_BACHMANN_OT200
-	bool "OT200"
+source "src/mainboard/bachmann/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/bachmann/ot200/Kconfig"
+source "src/mainboard/bachmann/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/bachmann/Kconfig.name b/src/mainboard/bachmann/Kconfig.name
new file mode 100644
index 0000000..ab6bc1e
--- /dev/null
+++ b/src/mainboard/bachmann/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_BACHMANN
+	bool "Bachmann electronic"
diff --git a/src/mainboard/bachmann/ot200/Kconfig.name b/src/mainboard/bachmann/ot200/Kconfig.name
new file mode 100644
index 0000000..4b63f968
--- /dev/null
+++ b/src/mainboard/bachmann/ot200/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_BACHMANN_OT200
+	bool "OT200"
diff --git a/src/mainboard/bcom/Kconfig b/src/mainboard/bcom/Kconfig
index 5c7e41b..91158e4 100644
--- a/src/mainboard/bcom/Kconfig
+++ b/src/mainboard/bcom/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_BCOM_WINNETP680
-	bool "WinNET P680"
+source "src/mainboard/bcom/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/bcom/winnetp680/Kconfig"
+source "src/mainboard/bcom/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/bcom/Kconfig.name b/src/mainboard/bcom/Kconfig.name
new file mode 100644
index 0000000..ac9686b
--- /dev/null
+++ b/src/mainboard/bcom/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_BCOM
+	bool "BCOM"
diff --git a/src/mainboard/bcom/winnetp680/Kconfig.name b/src/mainboard/bcom/winnetp680/Kconfig.name
new file mode 100644
index 0000000..5b09e7a
--- /dev/null
+++ b/src/mainboard/bcom/winnetp680/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_BCOM_WINNETP680
+	bool "WinNET P680"
diff --git a/src/mainboard/bifferos/Kconfig b/src/mainboard/bifferos/Kconfig
index de6fb5c..5022c40 100644
--- a/src/mainboard/bifferos/Kconfig
+++ b/src/mainboard/bifferos/Kconfig
@@ -22,12 +22,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_BIFFEROS_BIFFERBOARD
-	bool "Bifferboard"
+source "src/mainboard/bifferos/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/bifferos/bifferboard/Kconfig"
+source "src/mainboard/bifferos/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/bifferos/Kconfig.name b/src/mainboard/bifferos/Kconfig.name
new file mode 100644
index 0000000..d16063e
--- /dev/null
+++ b/src/mainboard/bifferos/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_BIFFEROS
+	bool "Bifferos"
diff --git a/src/mainboard/bifferos/bifferboard/Kconfig.name b/src/mainboard/bifferos/bifferboard/Kconfig.name
new file mode 100644
index 0000000..c5eeaaa
--- /dev/null
+++ b/src/mainboard/bifferos/bifferboard/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_BIFFEROS_BIFFERBOARD
+	bool "Bifferboard"
diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig
index 326edd7..17fbb1a 100644
--- a/src/mainboard/biostar/Kconfig
+++ b/src/mainboard/biostar/Kconfig
@@ -22,16 +22,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_BIOSTAR_M6TBA
-	bool "M6TBA"
-
-config BOARD_BIOSTAR_AM1ML
-	bool "AM1ML"
+source "src/mainboard/biostar/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/biostar/m6tba/Kconfig"
-source "src/mainboard/biostar/am1ml/Kconfig"
+source "src/mainboard/biostar/*/Kconfig"
 
 
 config MAINBOARD_VENDOR
diff --git a/src/mainboard/biostar/Kconfig.name b/src/mainboard/biostar/Kconfig.name
new file mode 100644
index 0000000..231b0d2
--- /dev/null
+++ b/src/mainboard/biostar/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_BIOSTAR
+	bool "Biostar"
diff --git a/src/mainboard/biostar/am1ml/Kconfig.name b/src/mainboard/biostar/am1ml/Kconfig.name
new file mode 100644
index 0000000..ccfa6fe
--- /dev/null
+++ b/src/mainboard/biostar/am1ml/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_BIOSTAR_AM1ML
+	bool "AM1ML"
diff --git a/src/mainboard/biostar/m6tba/Kconfig.name b/src/mainboard/biostar/m6tba/Kconfig.name
new file mode 100644
index 0000000..3db0016
--- /dev/null
+++ b/src/mainboard/biostar/m6tba/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_BIOSTAR_M6TBA
+	bool "M6TBA"
diff --git a/src/mainboard/broadcom/Kconfig b/src/mainboard/broadcom/Kconfig
index d05c311..da78266 100644
--- a/src/mainboard/broadcom/Kconfig
+++ b/src/mainboard/broadcom/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_BROADCOM_BLAST
-	bool "Blast"
+source "src/mainboard/broadcom/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/broadcom/blast/Kconfig"
+source "src/mainboard/broadcom/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/broadcom/Kconfig.name b/src/mainboard/broadcom/Kconfig.name
new file mode 100644
index 0000000..434694f
--- /dev/null
+++ b/src/mainboard/broadcom/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_BROADCOM
+	bool "Broadcom"
diff --git a/src/mainboard/broadcom/blast/Kconfig.name b/src/mainboard/broadcom/blast/Kconfig.name
new file mode 100644
index 0000000..04e4966
--- /dev/null
+++ b/src/mainboard/broadcom/blast/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_BROADCOM_BLAST
+	bool "Blast"
diff --git a/src/mainboard/compaq/Kconfig b/src/mainboard/compaq/Kconfig
index bb21906..e29cc5b 100644
--- a/src/mainboard/compaq/Kconfig
+++ b/src/mainboard/compaq/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_COMPAQ_DESKPRO_EN_SFF_P600
-	bool "Deskpro EN SFF P600"
+source "src/mainboard/compaq/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/compaq/deskpro_en_sff_p600/Kconfig"
+source "src/mainboard/compaq/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/compaq/Kconfig.name b/src/mainboard/compaq/Kconfig.name
new file mode 100644
index 0000000..0fc95d5
--- /dev/null
+++ b/src/mainboard/compaq/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_COMPAQ
+	bool "Compaq"
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig.name b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig.name
new file mode 100644
index 0000000..e226cd7b
--- /dev/null
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_COMPAQ_DESKPRO_EN_SFF_P600
+	bool "Deskpro EN SFF P600"
diff --git a/src/mainboard/cubietech/Kconfig b/src/mainboard/cubietech/Kconfig
index 840ee85..c0e9cc1 100644
--- a/src/mainboard/cubietech/Kconfig
+++ b/src/mainboard/cubietech/Kconfig
@@ -4,12 +4,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_CUBIETECH_CUBIEBOARD
-	bool "Cubieboard"
+source "src/mainboard/cubietech/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/cubietech/cubieboard/Kconfig"
+source "src/mainboard/cubietech/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/cubietech/Kconfig.name b/src/mainboard/cubietech/Kconfig.name
new file mode 100644
index 0000000..0ebc088
--- /dev/null
+++ b/src/mainboard/cubietech/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_CUBIETECH
+	bool "Cubietech"
diff --git a/src/mainboard/cubietech/cubieboard/Kconfig.name b/src/mainboard/cubietech/cubieboard/Kconfig.name
new file mode 100644
index 0000000..3a01181
--- /dev/null
+++ b/src/mainboard/cubietech/cubieboard/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_CUBIETECH_CUBIEBOARD
+	bool "Cubieboard"
diff --git a/src/mainboard/digitallogic/Kconfig b/src/mainboard/digitallogic/Kconfig
index 8aff47c..9b08501 100644
--- a/src/mainboard/digitallogic/Kconfig
+++ b/src/mainboard/digitallogic/Kconfig
@@ -3,15 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_DIGITALLOGIC_ADL855PC
-	bool "smartModule855"
-config BOARD_DIGITALLOGIC_MSM800SEV
-	bool "MSM800SEV"
+source "src/mainboard/digitallogic/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/digitallogic/adl855pc/Kconfig"
-source "src/mainboard/digitallogic/msm800sev/Kconfig"
+source "src/mainboard/digitallogic/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/digitallogic/Kconfig.name b/src/mainboard/digitallogic/Kconfig.name
new file mode 100644
index 0000000..e47eadf
--- /dev/null
+++ b/src/mainboard/digitallogic/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_DIGITALLOGIC
+	bool "DIGITAL-LOGIC"
diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig.name b/src/mainboard/digitallogic/adl855pc/Kconfig.name
new file mode 100644
index 0000000..70898e2
--- /dev/null
+++ b/src/mainboard/digitallogic/adl855pc/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_DIGITALLOGIC_ADL855PC
+	bool "smartModule855"
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig.name b/src/mainboard/digitallogic/msm800sev/Kconfig.name
new file mode 100644
index 0000000..0f3dad0
--- /dev/null
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_DIGITALLOGIC_MSM800SEV
+	bool "MSM800SEV"
diff --git a/src/mainboard/dmp/Kconfig b/src/mainboard/dmp/Kconfig
index c3196d2..96f0cd1 100644
--- a/src/mainboard/dmp/Kconfig
+++ b/src/mainboard/dmp/Kconfig
@@ -22,12 +22,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_DMP_EX
-	bool "Vortex86EX"
+source "src/mainboard/dmp/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/dmp/vortex86ex/Kconfig"
+source "src/mainboard/dmp/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/dmp/Kconfig.name b/src/mainboard/dmp/Kconfig.name
new file mode 100644
index 0000000..ddce56a
--- /dev/null
+++ b/src/mainboard/dmp/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_DMP
+	bool "DMP"
diff --git a/src/mainboard/dmp/vortex86ex/Kconfig.name b/src/mainboard/dmp/vortex86ex/Kconfig.name
new file mode 100644
index 0000000..8e1a564
--- /dev/null
+++ b/src/mainboard/dmp/vortex86ex/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_DMP_EX
+	bool "Vortex86EX"
diff --git a/src/mainboard/ecs/Kconfig b/src/mainboard/ecs/Kconfig
index 7dd9fa9..3b829d5 100644
--- a/src/mainboard/ecs/Kconfig
+++ b/src/mainboard/ecs/Kconfig
@@ -22,12 +22,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_ECS_P6IWP_FE
-	bool "P6IWP-Fe"
+source "src/mainboard/ecs/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/ecs/p6iwp-fe/Kconfig"
+source "src/mainboard/ecs/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/ecs/Kconfig.name b/src/mainboard/ecs/Kconfig.name
new file mode 100644
index 0000000..778c369
--- /dev/null
+++ b/src/mainboard/ecs/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_ECS
+	bool "ECS"
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig.name b/src/mainboard/ecs/p6iwp-fe/Kconfig.name
new file mode 100644
index 0000000..66fc8c3
--- /dev/null
+++ b/src/mainboard/ecs/p6iwp-fe/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_ECS_P6IWP_FE
+	bool "P6IWP-Fe"
diff --git a/src/mainboard/emulation/Kconfig b/src/mainboard/emulation/Kconfig
index e48c242..1dc89ca 100644
--- a/src/mainboard/emulation/Kconfig
+++ b/src/mainboard/emulation/Kconfig
@@ -3,16 +3,7 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_EMULATION_QEMU_X86_I440FX
-	bool "QEMU x86 i440fx/piix4 (aka qemu -M pc)"
-config BOARD_EMULATION_QEMU_X86_Q35
-	bool "QEMU x86 q35/ich9 (aka qemu -M q35, since v1.4)"
-
-config BOARD_EMULATION_QEMU_ARMV7
-	bool "QEMU armv7 (vexpress-a9)"
-
-config BOARD_EMULATION_QEMU_UCB_RISCV
-	bool "QEMU ucb riscv"
+source "src/mainboard/emulation/*/Kconfig.name"
 
 endchoice
 
@@ -21,10 +12,7 @@
 	default y
 	depends on BOARD_EMULATION_QEMU_X86_I440FX || BOARD_EMULATION_QEMU_X86_Q35
 
-source "src/mainboard/emulation/qemu-i440fx/Kconfig"
-source "src/mainboard/emulation/qemu-q35/Kconfig"
-source "src/mainboard/emulation/qemu-armv7/Kconfig"
-source "src/mainboard/emulation/qemu-riscv/Kconfig"
+source "src/mainboard/emulation/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/emulation/Kconfig.name b/src/mainboard/emulation/Kconfig.name
new file mode 100644
index 0000000..cf9dffa
--- /dev/null
+++ b/src/mainboard/emulation/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_EMULATION
+	bool "Emulation"
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig.name b/src/mainboard/emulation/qemu-armv7/Kconfig.name
new file mode 100644
index 0000000..6106407
--- /dev/null
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_EMULATION_QEMU_ARMV7
+	bool "QEMU armv7 (vexpress-a9)"
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig.name b/src/mainboard/emulation/qemu-i440fx/Kconfig.name
new file mode 100644
index 0000000..0b387fa
--- /dev/null
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_EMULATION_QEMU_X86_I440FX
+	bool "QEMU x86 i440fx/piix4 (aka qemu -M pc)"
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig.name b/src/mainboard/emulation/qemu-q35/Kconfig.name
new file mode 100644
index 0000000..ab1dbc3
--- /dev/null
+++ b/src/mainboard/emulation/qemu-q35/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_EMULATION_QEMU_X86_Q35
+	bool "QEMU x86 q35/ich9 (aka qemu -M q35, since v1.4)"
diff --git a/src/mainboard/emulation/qemu-riscv/Kconfig.name b/src/mainboard/emulation/qemu-riscv/Kconfig.name
new file mode 100644
index 0000000..5482f22
--- /dev/null
+++ b/src/mainboard/emulation/qemu-riscv/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_EMULATION_QEMU_UCB_RISCV
+	bool "QEMU ucb riscv"
diff --git a/src/mainboard/getac/Kconfig b/src/mainboard/getac/Kconfig
index 47cd1cf..7712d9a 100644
--- a/src/mainboard/getac/Kconfig
+++ b/src/mainboard/getac/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_GETAC_P470
-	bool "P470"
+source "src/mainboard/getac/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/getac/p470/Kconfig"
+source "src/mainboard/getac/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/getac/Kconfig.name b/src/mainboard/getac/Kconfig.name
new file mode 100644
index 0000000..089a616
--- /dev/null
+++ b/src/mainboard/getac/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_GETAC
+	bool "Getac"
diff --git a/src/mainboard/getac/p470/Kconfig.name b/src/mainboard/getac/p470/Kconfig.name
new file mode 100644
index 0000000..ffa807a
--- /dev/null
+++ b/src/mainboard/getac/p470/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GETAC_P470
+	bool "P470"
diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig
index c46b979..a651b57 100644
--- a/src/mainboard/gigabyte/Kconfig
+++ b/src/mainboard/gigabyte/Kconfig
@@ -21,33 +21,11 @@
 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 0000000..d98df3e
--- /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 0000000..4fb5842
--- /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 0000000..0912807
--- /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 0000000..571f6d1
--- /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 0000000..435f1a6
--- /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 0000000..32a5470
--- /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 0000000..79555fa
--- /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 0000000..4700e2d
--- /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 0000000..5b21fde
--- /dev/null
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIGABYTE_MA78GM
+	bool "GA-MA78GM-US2H"
diff --git a/src/mainboard/gizmosphere/Kconfig b/src/mainboard/gizmosphere/Kconfig
index 715da8f..4238ec5 100644
--- a/src/mainboard/gizmosphere/Kconfig
+++ b/src/mainboard/gizmosphere/Kconfig
@@ -22,16 +22,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_GIZMOSPHERE_GIZMO
-	bool "Gizmo"
-
-config BOARD_GIZMOSPHERE_GIZMO2
-	bool "Gizmo2"
+source "src/mainboard/gizmosphere/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/gizmosphere/gizmo/Kconfig"
-source "src/mainboard/gizmosphere/gizmo2/Kconfig"
+source "src/mainboard/gizmosphere/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/gizmosphere/Kconfig.name b/src/mainboard/gizmosphere/Kconfig.name
new file mode 100644
index 0000000..dacb5d8f
--- /dev/null
+++ b/src/mainboard/gizmosphere/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_GIZMOSPHERE
+	bool "GizmoSphere"
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig.name b/src/mainboard/gizmosphere/gizmo/Kconfig.name
new file mode 100644
index 0000000..97c1f79
--- /dev/null
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIZMOSPHERE_GIZMO
+	bool "Gizmo"
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig.name b/src/mainboard/gizmosphere/gizmo2/Kconfig.name
new file mode 100644
index 0000000..a3bae57
--- /dev/null
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GIZMOSPHERE_GIZMO2
+	bool "Gizmo2"
diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig
index 6e5eb73..98ec046 100644
--- a/src/mainboard/google/Kconfig
+++ b/src/mainboard/google/Kconfig
@@ -21,95 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_GOOGLE_BOLT
-	bool "Bolt"
-config BOARD_GOOGLE_BUTTERFLY
-	bool "Butterfly"
-config BOARD_GOOGLE_COSMOS
-	bool "Cosmos"
-config BOARD_GOOGLE_DAISY
-	bool "Daisy"
-config BOARD_GOOGLE_FALCO
-	bool "Falco"
-config BOARD_GOOGLE_LINK
-	bool "Link"
-config BOARD_GOOGLE_NYAN
-	bool "Nyan"
-config BOARD_GOOGLE_NYAN_BIG
-	bool "Nyan Big"
-config BOARD_GOOGLE_NYAN_BLAZE
-	bool "Nyan Blaze"
-config BOARD_GOOGLE_PANTHER
-	bool "Panther"
-config BOARD_GOOGLE_PARROT
-	bool "Parrot"
-config BOARD_GOOGLE_PEACH_PIT
-	bool "Peach Pit"
-config BOARD_GOOGLE_PEPPY
-	bool "Peppy"
-config BOARD_GOOGLE_PURIN
-	bool "Purin"
-config BOARD_GOOGLE_RAMBI
-	bool "Rambi"
-config BOARD_GOOGLE_RUSH
-	bool "Rush"
-config BOARD_GOOGLE_RUSH_RYU
-	bool "Rush Ryu"
-config BOARD_GOOGLE_SAMUS
-	bool "Samus"
-config BOARD_GOOGLE_SLIPPY
-	bool "Slippy"
-config BOARD_GOOGLE_STORM
-	bool "Storm"
-config BOARD_GOOGLE_STOUT
-	bool "Stout"
-config BOARD_GOOGLE_URARA
-	bool "Urara"
-config BOARD_GOOGLE_VEYRON_BRAIN
-	bool "Veyron_Brain"
-config BOARD_GOOGLE_VEYRON_DANGER
-	bool "Veyron_Danger"
-config BOARD_GOOGLE_VEYRON_JERRY
-	bool "Veyron_Jerry"
-config BOARD_GOOGLE_VEYRON_MIGHTY
-	bool "Veyron_Mighty"
-config BOARD_GOOGLE_VEYRON_PINKY
-	bool "Veyron_Pinky"
-config BOARD_GOOGLE_VEYRON_RIALTO
-        bool "Veyron_Rialto"
-config BOARD_GOOGLE_VEYRON_SPEEDY
-	bool "Veyron_Speedy"
+source "src/mainboard/google/*/Kconfig.name"
+
 endchoice
 
-source "src/mainboard/google/bolt/Kconfig"
-source "src/mainboard/google/butterfly/Kconfig"
-source "src/mainboard/google/cosmos/Kconfig"
-source "src/mainboard/google/daisy/Kconfig"
-source "src/mainboard/google/falco/Kconfig"
-source "src/mainboard/google/link/Kconfig"
-source "src/mainboard/google/nyan/Kconfig"
-source "src/mainboard/google/nyan_big/Kconfig"
-source "src/mainboard/google/nyan_blaze/Kconfig"
-source "src/mainboard/google/panther/Kconfig"
-source "src/mainboard/google/parrot/Kconfig"
-source "src/mainboard/google/peach_pit/Kconfig"
-source "src/mainboard/google/peppy/Kconfig"
-source "src/mainboard/google/purin/Kconfig"
-source "src/mainboard/google/rambi/Kconfig"
-source "src/mainboard/google/rush/Kconfig"
-source "src/mainboard/google/rush_ryu/Kconfig"
-source "src/mainboard/google/samus/Kconfig"
-source "src/mainboard/google/slippy/Kconfig"
-source "src/mainboard/google/storm/Kconfig"
-source "src/mainboard/google/stout/Kconfig"
-source "src/mainboard/google/urara/Kconfig"
-source "src/mainboard/google/veyron_brain/Kconfig"
-source "src/mainboard/google/veyron_danger/Kconfig"
-source "src/mainboard/google/veyron_jerry/Kconfig"
-source "src/mainboard/google/veyron_mighty/Kconfig"
-source "src/mainboard/google/veyron_pinky/Kconfig"
-source "src/mainboard/google/veyron_rialto/Kconfig"
-source "src/mainboard/google/veyron_speedy/Kconfig"
+source "src/mainboard/google/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string "Mainboard Vendor"
diff --git a/src/mainboard/google/Kconfig.name b/src/mainboard/google/Kconfig.name
new file mode 100644
index 0000000..6ae874b
--- /dev/null
+++ b/src/mainboard/google/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_GOOGLE
+	bool "Google"
diff --git a/src/mainboard/google/bolt/Kconfig.name b/src/mainboard/google/bolt/Kconfig.name
new file mode 100644
index 0000000..4794eca
--- /dev/null
+++ b/src/mainboard/google/bolt/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_BOLT
+	bool "Bolt"
diff --git a/src/mainboard/google/butterfly/Kconfig.name b/src/mainboard/google/butterfly/Kconfig.name
new file mode 100644
index 0000000..1e046e5
--- /dev/null
+++ b/src/mainboard/google/butterfly/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_BUTTERFLY
+	bool "Butterfly"
diff --git a/src/mainboard/google/cosmos/Kconfig.name b/src/mainboard/google/cosmos/Kconfig.name
new file mode 100644
index 0000000..6dade21
--- /dev/null
+++ b/src/mainboard/google/cosmos/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_COSMOS
+	bool "Cosmos"
diff --git a/src/mainboard/google/daisy/Kconfig.name b/src/mainboard/google/daisy/Kconfig.name
new file mode 100644
index 0000000..0fc3f6b
--- /dev/null
+++ b/src/mainboard/google/daisy/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_DAISY
+	bool "Daisy"
diff --git a/src/mainboard/google/falco/Kconfig.name b/src/mainboard/google/falco/Kconfig.name
new file mode 100644
index 0000000..2cb5ad8
--- /dev/null
+++ b/src/mainboard/google/falco/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_FALCO
+	bool "Falco"
diff --git a/src/mainboard/google/link/Kconfig.name b/src/mainboard/google/link/Kconfig.name
new file mode 100644
index 0000000..289164b
--- /dev/null
+++ b/src/mainboard/google/link/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_LINK
+	bool "Link"
diff --git a/src/mainboard/google/nyan/Kconfig.name b/src/mainboard/google/nyan/Kconfig.name
new file mode 100644
index 0000000..7bd64bb
--- /dev/null
+++ b/src/mainboard/google/nyan/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_NYAN
+	bool "Nyan"
diff --git a/src/mainboard/google/nyan_big/Kconfig.name b/src/mainboard/google/nyan_big/Kconfig.name
new file mode 100644
index 0000000..66ea877
--- /dev/null
+++ b/src/mainboard/google/nyan_big/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_NYAN_BIG
+	bool "Nyan Big"
diff --git a/src/mainboard/google/nyan_blaze/Kconfig.name b/src/mainboard/google/nyan_blaze/Kconfig.name
new file mode 100644
index 0000000..a8dd164
--- /dev/null
+++ b/src/mainboard/google/nyan_blaze/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_NYAN_BLAZE
+	bool "Nyan Blaze"
diff --git a/src/mainboard/google/panther/Kconfig.name b/src/mainboard/google/panther/Kconfig.name
new file mode 100644
index 0000000..c8cd14b
--- /dev/null
+++ b/src/mainboard/google/panther/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_PANTHER
+	bool "Panther"
diff --git a/src/mainboard/google/parrot/Kconfig.name b/src/mainboard/google/parrot/Kconfig.name
new file mode 100644
index 0000000..7bbc998
--- /dev/null
+++ b/src/mainboard/google/parrot/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_PARROT
+	bool "Parrot"
diff --git a/src/mainboard/google/peach_pit/Kconfig.name b/src/mainboard/google/peach_pit/Kconfig.name
new file mode 100644
index 0000000..a3be909
--- /dev/null
+++ b/src/mainboard/google/peach_pit/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_PEACH_PIT
+	bool "Peach Pit"
diff --git a/src/mainboard/google/peppy/Kconfig.name b/src/mainboard/google/peppy/Kconfig.name
new file mode 100644
index 0000000..8049a54
--- /dev/null
+++ b/src/mainboard/google/peppy/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_PEPPY
+	bool "Peppy"
diff --git a/src/mainboard/google/purin/Kconfig.name b/src/mainboard/google/purin/Kconfig.name
new file mode 100644
index 0000000..db960087
--- /dev/null
+++ b/src/mainboard/google/purin/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_PURIN
+	bool "Purin"
diff --git a/src/mainboard/google/rambi/Kconfig.name b/src/mainboard/google/rambi/Kconfig.name
new file mode 100644
index 0000000..b1b0b6a
--- /dev/null
+++ b/src/mainboard/google/rambi/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_RAMBI
+	bool "Rambi"
diff --git a/src/mainboard/google/rush/Kconfig.name b/src/mainboard/google/rush/Kconfig.name
new file mode 100644
index 0000000..fff6eb4
--- /dev/null
+++ b/src/mainboard/google/rush/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_RUSH
+	bool "Rush"
diff --git a/src/mainboard/google/rush_ryu/Kconfig.name b/src/mainboard/google/rush_ryu/Kconfig.name
new file mode 100644
index 0000000..a616f23
--- /dev/null
+++ b/src/mainboard/google/rush_ryu/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_RUSH_RYU
+	bool "Rush Ryu"
diff --git a/src/mainboard/google/samus/Kconfig.name b/src/mainboard/google/samus/Kconfig.name
new file mode 100644
index 0000000..6765d16
--- /dev/null
+++ b/src/mainboard/google/samus/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_SAMUS
+	bool "Samus"
diff --git a/src/mainboard/google/slippy/Kconfig.name b/src/mainboard/google/slippy/Kconfig.name
new file mode 100644
index 0000000..4892fca
--- /dev/null
+++ b/src/mainboard/google/slippy/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_SLIPPY
+	bool "Slippy"
diff --git a/src/mainboard/google/storm/Kconfig.name b/src/mainboard/google/storm/Kconfig.name
new file mode 100644
index 0000000..72e2df5
--- /dev/null
+++ b/src/mainboard/google/storm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_STORM
+	bool "Storm"
diff --git a/src/mainboard/google/stout/Kconfig.name b/src/mainboard/google/stout/Kconfig.name
new file mode 100644
index 0000000..8b007f1
--- /dev/null
+++ b/src/mainboard/google/stout/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_STOUT
+	bool "Stout"
diff --git a/src/mainboard/google/urara/Kconfig.name b/src/mainboard/google/urara/Kconfig.name
new file mode 100644
index 0000000..edc935a
--- /dev/null
+++ b/src/mainboard/google/urara/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_URARA
+	bool "Urara"
diff --git a/src/mainboard/google/veyron_brain/Kconfig.name b/src/mainboard/google/veyron_brain/Kconfig.name
new file mode 100644
index 0000000..6d5694d
--- /dev/null
+++ b/src/mainboard/google/veyron_brain/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_BRAIN
+	bool "Veyron_Brain"
diff --git a/src/mainboard/google/veyron_danger/Kconfig.name b/src/mainboard/google/veyron_danger/Kconfig.name
new file mode 100644
index 0000000..8e6d070
--- /dev/null
+++ b/src/mainboard/google/veyron_danger/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_DANGER
+	bool "Veyron_Danger"
diff --git a/src/mainboard/google/veyron_jerry/Kconfig.name b/src/mainboard/google/veyron_jerry/Kconfig.name
new file mode 100644
index 0000000..10c5f4e
--- /dev/null
+++ b/src/mainboard/google/veyron_jerry/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_JERRY
+	bool "Veyron_Jerry"
diff --git a/src/mainboard/google/veyron_mighty/Kconfig.name b/src/mainboard/google/veyron_mighty/Kconfig.name
new file mode 100644
index 0000000..0eb4536e
--- /dev/null
+++ b/src/mainboard/google/veyron_mighty/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_MIGHTY
+	bool "Veyron_Mighty"
diff --git a/src/mainboard/google/veyron_pinky/Kconfig.name b/src/mainboard/google/veyron_pinky/Kconfig.name
new file mode 100644
index 0000000..37d92f2
--- /dev/null
+++ b/src/mainboard/google/veyron_pinky/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_PINKY
+	bool "Veyron_Pinky"
diff --git a/src/mainboard/google/veyron_rialto/Kconfig.name b/src/mainboard/google/veyron_rialto/Kconfig.name
new file mode 100644
index 0000000..80d8052
--- /dev/null
+++ b/src/mainboard/google/veyron_rialto/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_RIALTO
+	bool "Veyron_Rialto"
diff --git a/src/mainboard/google/veyron_speedy/Kconfig.name b/src/mainboard/google/veyron_speedy/Kconfig.name
new file mode 100644
index 0000000..a5b2c9d
--- /dev/null
+++ b/src/mainboard/google/veyron_speedy/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_GOOGLE_VEYRON_SPEEDY
+	bool "Veyron_Speedy"
diff --git a/src/mainboard/hp/Kconfig b/src/mainboard/hp/Kconfig
index 3efd1dd..9d768ae 100644
--- a/src/mainboard/hp/Kconfig
+++ b/src/mainboard/hp/Kconfig
@@ -3,28 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_HP_ABM
-	bool "ABM"
-config BOARD_HP_DL145_G1
-	bool "ProLiant DL145 G1"
-config BOARD_HP_DL145_G3
-	bool "ProLiant DL145 G3"
-config BOARD_HP_DL165_G6_FAM10
-	bool "ProLiant DL165 G6 Fam10"
-config BOARD_HP_E_VECTRA_P2706T
-	bool "e-Vectra P2706T"
-config BOARD_HP_PAVILION_M6_1035DX
-	bool "Pavilion m6 1035dx"
-
+source "src/mainboard/hp/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/hp/abm/Kconfig"
-source "src/mainboard/hp/dl145_g1/Kconfig"
-source "src/mainboard/hp/dl145_g3/Kconfig"
-source "src/mainboard/hp/dl165_g6_fam10/Kconfig"
-source "src/mainboard/hp/e_vectra_p2706t/Kconfig"
-source "src/mainboard/hp/pavilion_m6_1035dx/Kconfig"
+source "src/mainboard/hp/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/hp/Kconfig.name b/src/mainboard/hp/Kconfig.name
new file mode 100644
index 0000000..09398e2
--- /dev/null
+++ b/src/mainboard/hp/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_HP
+	bool "HP"
diff --git a/src/mainboard/hp/abm/Kconfig.name b/src/mainboard/hp/abm/Kconfig.name
new file mode 100644
index 0000000..4ace573
--- /dev/null
+++ b/src/mainboard/hp/abm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_HP_ABM
+	bool "ABM"
diff --git a/src/mainboard/hp/dl145_g1/Kconfig.name b/src/mainboard/hp/dl145_g1/Kconfig.name
new file mode 100644
index 0000000..2840287
--- /dev/null
+++ b/src/mainboard/hp/dl145_g1/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_HP_DL145_G1
+	bool "ProLiant DL145 G1"
diff --git a/src/mainboard/hp/dl145_g3/Kconfig.name b/src/mainboard/hp/dl145_g3/Kconfig.name
new file mode 100644
index 0000000..ebbc20f
--- /dev/null
+++ b/src/mainboard/hp/dl145_g3/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_HP_DL145_G3
+	bool "ProLiant DL145 G3"
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig.name b/src/mainboard/hp/dl165_g6_fam10/Kconfig.name
new file mode 100644
index 0000000..ceb6e86
--- /dev/null
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_HP_DL165_G6_FAM10
+	bool "ProLiant DL165 G6 Fam10"
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig.name b/src/mainboard/hp/e_vectra_p2706t/Kconfig.name
new file mode 100644
index 0000000..f37ab1e
--- /dev/null
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_HP_E_VECTRA_P2706T
+	bool "e-Vectra P2706T"
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig.name b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig.name
new file mode 100644
index 0000000..a736970
--- /dev/null
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_HP_PAVILION_M6_1035DX
+	bool "Pavilion m6 1035dx"
diff --git a/src/mainboard/ibase/Kconfig b/src/mainboard/ibase/Kconfig
index 7eac9ae..2c33d58c 100644
--- a/src/mainboard/ibase/Kconfig
+++ b/src/mainboard/ibase/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_IBASE_MB899
-	bool "MB899"
+source "src/mainboard/ibase/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/ibase/mb899/Kconfig"
+source "src/mainboard/ibase/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/ibase/Kconfig.name b/src/mainboard/ibase/Kconfig.name
new file mode 100644
index 0000000..921ecef
--- /dev/null
+++ b/src/mainboard/ibase/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_IBASE
+	bool "iBase"
diff --git a/src/mainboard/ibase/mb899/Kconfig.name b/src/mainboard/ibase/mb899/Kconfig.name
new file mode 100644
index 0000000..abfb7db
--- /dev/null
+++ b/src/mainboard/ibase/mb899/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IBASE_MB899
+	bool "MB899"
diff --git a/src/mainboard/ibm/Kconfig b/src/mainboard/ibm/Kconfig
index 642bb86..256fefe 100644
--- a/src/mainboard/ibm/Kconfig
+++ b/src/mainboard/ibm/Kconfig
@@ -3,15 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_IBM_E325
-	bool "eServer 325"
-config BOARD_IBM_E326
-	bool "eServer 326"
+source "src/mainboard/ibm/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/ibm/e325/Kconfig"
-source "src/mainboard/ibm/e326/Kconfig"
+source "src/mainboard/ibm/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/ibm/Kconfig.name b/src/mainboard/ibm/Kconfig.name
new file mode 100644
index 0000000..7f3cb17
--- /dev/null
+++ b/src/mainboard/ibm/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_IBM
+	bool "IBM"
diff --git a/src/mainboard/ibm/e325/Kconfig.name b/src/mainboard/ibm/e325/Kconfig.name
new file mode 100644
index 0000000..7a0ea83
--- /dev/null
+++ b/src/mainboard/ibm/e325/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IBM_E325
+	bool "eServer 325"
diff --git a/src/mainboard/ibm/e326/Kconfig.name b/src/mainboard/ibm/e326/Kconfig.name
new file mode 100644
index 0000000..138fd51
--- /dev/null
+++ b/src/mainboard/ibm/e326/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IBM_E326
+	bool "eServer 326"
diff --git a/src/mainboard/iei/Kconfig b/src/mainboard/iei/Kconfig
index d6578de..1d0a1e2 100644
--- a/src/mainboard/iei/Kconfig
+++ b/src/mainboard/iei/Kconfig
@@ -21,21 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_IEI_KINO_FAM10
-	bool "Kino-780AM2(Fam10)"
-config BOARD_IEI_PCISA_LX_800_R10
-	bool "PCISA LX-800-R10"
-config BOARD_IEI_PM_LX_800_R11
-	bool "PM LX-800-R11"
-config BOARD_IEI_PM_LX2_800_R10
-	bool "PM LX2-800-R10"
+source "src/mainboard/iei/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/iei/kino-780am2-fam10/Kconfig"
-source "src/mainboard/iei/pcisa-lx-800-r10/Kconfig"
-source "src/mainboard/iei/pm-lx-800-r11/Kconfig"
-source "src/mainboard/iei/pm-lx2-800-r10/Kconfig"
+source "src/mainboard/iei/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/iei/Kconfig.name b/src/mainboard/iei/Kconfig.name
new file mode 100644
index 0000000..1dec78d
--- /dev/null
+++ b/src/mainboard/iei/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_IEI
+	bool "IEI"
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig.name b/src/mainboard/iei/kino-780am2-fam10/Kconfig.name
new file mode 100644
index 0000000..20dfeda
--- /dev/null
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IEI_KINO_FAM10
+	bool "Kino-780AM2(Fam10)"
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig.name b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig.name
new file mode 100644
index 0000000..84d2f49
--- /dev/null
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IEI_PCISA_LX_800_R10
+	bool "PCISA LX-800-R10"
diff --git a/src/mainboard/iei/pm-lx-800-r11/Kconfig.name b/src/mainboard/iei/pm-lx-800-r11/Kconfig.name
new file mode 100644
index 0000000..e07451a
--- /dev/null
+++ b/src/mainboard/iei/pm-lx-800-r11/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IEI_PM_LX_800_R11
+	bool "PM LX-800-R11"
diff --git a/src/mainboard/iei/pm-lx2-800-r10/Kconfig.name b/src/mainboard/iei/pm-lx2-800-r10/Kconfig.name
new file mode 100644
index 0000000..af78c50
--- /dev/null
+++ b/src/mainboard/iei/pm-lx2-800-r10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IEI_PM_LX2_800_R10
+	bool "PM LX2-800-R10"
diff --git a/src/mainboard/intel/Kconfig b/src/mainboard/intel/Kconfig
index a51dc02..9f5e5af 100644
--- a/src/mainboard/intel/Kconfig
+++ b/src/mainboard/intel/Kconfig
@@ -3,48 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_INTEL_BAKERSPORT_FSP
-	bool "Bakersport FSP-based CRB"
-config BOARD_INTEL_BAYLEYBAY_FSP
-	bool "Bayley Bay FSP-based CRB"
-config BOARD_INTEL_COUGAR_CANYON2
-	bool "Cougar Canyon 2 CRB"
-config BOARD_INTEL_D810E2CB
-	bool "D810E2CB"
-config BOARD_INTEL_D945GCLF
-	bool "D945GCLF"
-config BOARD_INTEL_EAGLEHEIGHTS
-	bool "EagleHeights"
-config BOARD_INTEL_EMERALDLAKE2
-	bool "Emerald Lake 2 CRB"
-config BOARD_INTEL_MINNOWMAX
-	bool "Minnow Max"
-config BOARD_INTEL_MOHONPEAK
-	bool "Mohon Peak CRB"
-config BOARD_INTEL_MTARVON
-	bool "3100 devkit (Mt. Arvon)"
-config BOARD_INTEL_TRUXTON
-	bool "EP80579 devkit (Truxton)"
-config BOARD_INTEL_BASKING_RIDGE
-	bool "Basking Ridge CRB"
-config BOARD_INTEL_WTM2
-	bool "Whitetip Mountain 2 CRB"
+source "src/mainboard/intel/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/intel/bakersport_fsp/Kconfig"
-source "src/mainboard/intel/bayleybay_fsp/Kconfig"
-source "src/mainboard/intel/cougar_canyon2/Kconfig"
-source "src/mainboard/intel/d810e2cb/Kconfig"
-source "src/mainboard/intel/d945gclf/Kconfig"
-source "src/mainboard/intel/eagleheights/Kconfig"
-source "src/mainboard/intel/emeraldlake2/Kconfig"
-source "src/mainboard/intel/baskingridge/Kconfig"
-source "src/mainboard/intel/minnowmax/Kconfig"
-source "src/mainboard/intel/mohonpeak/Kconfig"
-source "src/mainboard/intel/mtarvon/Kconfig"
-source "src/mainboard/intel/truxton/Kconfig"
-source "src/mainboard/intel/wtm2/Kconfig"
+source "src/mainboard/intel/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/intel/Kconfig.name b/src/mainboard/intel/Kconfig.name
new file mode 100644
index 0000000..44eafbb
--- /dev/null
+++ b/src/mainboard/intel/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_INTEL
+	bool "Intel"
diff --git a/src/mainboard/intel/bakersport_fsp/Kconfig.name b/src/mainboard/intel/bakersport_fsp/Kconfig.name
new file mode 100644
index 0000000..65d5387
--- /dev/null
+++ b/src/mainboard/intel/bakersport_fsp/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_BAKERSPORT_FSP
+	bool "Bakersport FSP-based CRB"
diff --git a/src/mainboard/intel/baskingridge/Kconfig.name b/src/mainboard/intel/baskingridge/Kconfig.name
new file mode 100644
index 0000000..d4c35ec
--- /dev/null
+++ b/src/mainboard/intel/baskingridge/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_BASKING_RIDGE
+	bool "Basking Ridge CRB"
diff --git a/src/mainboard/intel/bayleybay_fsp/Kconfig.name b/src/mainboard/intel/bayleybay_fsp/Kconfig.name
new file mode 100644
index 0000000..52e6aaa
--- /dev/null
+++ b/src/mainboard/intel/bayleybay_fsp/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_BAYLEYBAY_FSP
+	bool "Bayley Bay FSP-based CRB"
diff --git a/src/mainboard/intel/cougar_canyon2/Kconfig.name b/src/mainboard/intel/cougar_canyon2/Kconfig.name
new file mode 100644
index 0000000..b2c8c1c
--- /dev/null
+++ b/src/mainboard/intel/cougar_canyon2/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_COUGAR_CANYON2
+	bool "Cougar Canyon 2 CRB"
diff --git a/src/mainboard/intel/d810e2cb/Kconfig.name b/src/mainboard/intel/d810e2cb/Kconfig.name
new file mode 100644
index 0000000..8bf8624a
--- /dev/null
+++ b/src/mainboard/intel/d810e2cb/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_D810E2CB
+	bool "D810E2CB"
diff --git a/src/mainboard/intel/d945gclf/Kconfig.name b/src/mainboard/intel/d945gclf/Kconfig.name
new file mode 100644
index 0000000..cf5a00d
--- /dev/null
+++ b/src/mainboard/intel/d945gclf/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_D945GCLF
+	bool "D945GCLF"
diff --git a/src/mainboard/intel/eagleheights/Kconfig.name b/src/mainboard/intel/eagleheights/Kconfig.name
new file mode 100644
index 0000000..95be5cb
--- /dev/null
+++ b/src/mainboard/intel/eagleheights/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_EAGLEHEIGHTS
+	bool "EagleHeights"
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig.name b/src/mainboard/intel/emeraldlake2/Kconfig.name
new file mode 100644
index 0000000..3348658
--- /dev/null
+++ b/src/mainboard/intel/emeraldlake2/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_EMERALDLAKE2
+	bool "Emerald Lake 2 CRB"
diff --git a/src/mainboard/intel/minnowmax/Kconfig.name b/src/mainboard/intel/minnowmax/Kconfig.name
new file mode 100644
index 0000000..abe9225
--- /dev/null
+++ b/src/mainboard/intel/minnowmax/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_MINNOWMAX
+	bool "Minnow Max"
diff --git a/src/mainboard/intel/mohonpeak/Kconfig.name b/src/mainboard/intel/mohonpeak/Kconfig.name
new file mode 100644
index 0000000..2fc6540
--- /dev/null
+++ b/src/mainboard/intel/mohonpeak/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_MOHONPEAK
+	bool "Mohon Peak CRB"
diff --git a/src/mainboard/intel/mtarvon/Kconfig.name b/src/mainboard/intel/mtarvon/Kconfig.name
new file mode 100644
index 0000000..30b547e
--- /dev/null
+++ b/src/mainboard/intel/mtarvon/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_MTARVON
+	bool "3100 devkit (Mt. Arvon)"
diff --git a/src/mainboard/intel/truxton/Kconfig.name b/src/mainboard/intel/truxton/Kconfig.name
new file mode 100644
index 0000000..f91b445
--- /dev/null
+++ b/src/mainboard/intel/truxton/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_TRUXTON
+	bool "EP80579 devkit (Truxton)"
diff --git a/src/mainboard/intel/wtm2/Kconfig.name b/src/mainboard/intel/wtm2/Kconfig.name
new file mode 100644
index 0000000..d0a474d
--- /dev/null
+++ b/src/mainboard/intel/wtm2/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_INTEL_WTM2
+	bool "Whitetip Mountain 2 CRB"
diff --git a/src/mainboard/iwave/Kconfig b/src/mainboard/iwave/Kconfig
index 9bd2c11..2af87f9 100644
--- a/src/mainboard/iwave/Kconfig
+++ b/src/mainboard/iwave/Kconfig
@@ -4,12 +4,11 @@
 	prompt "Mainboard model"
 	depends on VENDOR_IWAVE
 
-config BOARD_IWAVE_RAINBOW_G6
-	bool "iWRainbowG6"
+source "src/mainboard/iwave/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/iwave/iWRainbowG6/Kconfig"
+source "src/mainboard/iwave/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/iwave/Kconfig.name b/src/mainboard/iwave/Kconfig.name
new file mode 100644
index 0000000..2babae3
--- /dev/null
+++ b/src/mainboard/iwave/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_IWAVE
+	bool "iWave"
diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig.name b/src/mainboard/iwave/iWRainbowG6/Kconfig.name
new file mode 100644
index 0000000..d2be662
--- /dev/null
+++ b/src/mainboard/iwave/iWRainbowG6/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IWAVE_RAINBOW_G6
+	bool "iWRainbowG6"
diff --git a/src/mainboard/iwill/Kconfig b/src/mainboard/iwill/Kconfig
index c520138..75fa626 100644
--- a/src/mainboard/iwill/Kconfig
+++ b/src/mainboard/iwill/Kconfig
@@ -3,18 +3,11 @@
 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 0000000..026608b
--- /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 0000000..8d81fc1
--- /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 0000000..ff5a685
--- /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 0000000..a474a76
--- /dev/null
+++ b/src/mainboard/iwill/dk8x/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_IWILL_DK8X
+	bool "DK8X"
diff --git a/src/mainboard/jetway/Kconfig b/src/mainboard/jetway/Kconfig
index 5b55daa..63b3acc 100644
--- a/src/mainboard/jetway/Kconfig
+++ b/src/mainboard/jetway/Kconfig
@@ -3,24 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_JETWAY_J7F2
-	bool "J7F2"
-config BOARD_JETWAY_J7F4K1G2E
-	bool "J7F4K1G2E"
-config BOARD_JETWAY_J7F4K1G5D
-	bool "J7F4K1G5D"
-config BOARD_JETWAY_PA78VM5
-	bool "PA78VM5 (Fam10)"
-config BOARD_JETWAY_NF81_T56N_LF
-	bool "NF81_T56N_LF"
+source "src/mainboard/jetway/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/jetway/j7f2/Kconfig"
-source "src/mainboard/jetway/j7f4k1g2e/Kconfig"
-source "src/mainboard/jetway/j7f4k1g5d/Kconfig"
-source "src/mainboard/jetway/pa78vm5/Kconfig"
-source "src/mainboard/jetway/nf81-t56n-lf/Kconfig"
+source "src/mainboard/jetway/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/jetway/Kconfig.name b/src/mainboard/jetway/Kconfig.name
new file mode 100644
index 0000000..3012839
--- /dev/null
+++ b/src/mainboard/jetway/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_JETWAY
+	bool "Jetway"
diff --git a/src/mainboard/jetway/j7f2/Kconfig.name b/src/mainboard/jetway/j7f2/Kconfig.name
new file mode 100644
index 0000000..0261d16
--- /dev/null
+++ b/src/mainboard/jetway/j7f2/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_JETWAY_J7F2
+	bool "J7F2"
diff --git a/src/mainboard/jetway/j7f4k1g2e/Kconfig.name b/src/mainboard/jetway/j7f4k1g2e/Kconfig.name
new file mode 100644
index 0000000..67c6379
--- /dev/null
+++ b/src/mainboard/jetway/j7f4k1g2e/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_JETWAY_J7F4K1G2E
+	bool "J7F4K1G2E"
diff --git a/src/mainboard/jetway/j7f4k1g5d/Kconfig.name b/src/mainboard/jetway/j7f4k1g5d/Kconfig.name
new file mode 100644
index 0000000..56fbd1e
--- /dev/null
+++ b/src/mainboard/jetway/j7f4k1g5d/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_JETWAY_J7F4K1G5D
+	bool "J7F4K1G5D"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name b/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name
new file mode 100644
index 0000000..2e660f9
--- /dev/null
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_JETWAY_NF81_T56N_LF
+	bool "NF81_T56N_LF"
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig.name b/src/mainboard/jetway/pa78vm5/Kconfig.name
new file mode 100644
index 0000000..9de8d2b
--- /dev/null
+++ b/src/mainboard/jetway/pa78vm5/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_JETWAY_PA78VM5
+	bool "PA78VM5 (Fam10)"
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig.name b/src/mainboard/kontron/986lcd-m/Kconfig.name
new file mode 100644
index 0000000..ae6f97c
--- /dev/null
+++ b/src/mainboard/kontron/986lcd-m/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_KONTRON_986LCD_M
+	bool "986LCD-M/mITX"
diff --git a/src/mainboard/kontron/Kconfig b/src/mainboard/kontron/Kconfig
index f4ab89f..82d1c4f 100644
--- a/src/mainboard/kontron/Kconfig
+++ b/src/mainboard/kontron/Kconfig
@@ -3,18 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_KONTRON_986LCD_M
-	bool "986LCD-M/mITX"
-config BOARD_KONTRON_KT690
-	bool "KT690/mITX"
-config BOARD_KONTRON_KTQM77
-	bool "KTQM77/mITX"
+source "src/mainboard/kontron/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/kontron/986lcd-m/Kconfig"
-source "src/mainboard/kontron/kt690/Kconfig"
-source "src/mainboard/kontron/ktqm77/Kconfig"
+source "src/mainboard/kontron/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/kontron/Kconfig.name b/src/mainboard/kontron/Kconfig.name
new file mode 100644
index 0000000..4471222
--- /dev/null
+++ b/src/mainboard/kontron/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_KONTRON
+	bool "Kontron"
diff --git a/src/mainboard/kontron/kt690/Kconfig.name b/src/mainboard/kontron/kt690/Kconfig.name
new file mode 100644
index 0000000..1a9313c
--- /dev/null
+++ b/src/mainboard/kontron/kt690/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_KONTRON_KT690
+	bool "KT690/mITX"
diff --git a/src/mainboard/kontron/ktqm77/Kconfig.name b/src/mainboard/kontron/ktqm77/Kconfig.name
new file mode 100644
index 0000000..601f57a
--- /dev/null
+++ b/src/mainboard/kontron/ktqm77/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_KONTRON_KTQM77
+	bool "KTQM77/mITX"
diff --git a/src/mainboard/lanner/Kconfig b/src/mainboard/lanner/Kconfig
index 842c4f0..3b304ba 100644
--- a/src/mainboard/lanner/Kconfig
+++ b/src/mainboard/lanner/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_LANNER_EM8510
-	bool "EM-8510"
+source "src/mainboard/lanner/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/lanner/em8510/Kconfig"
+source "src/mainboard/lanner/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/lanner/Kconfig.name b/src/mainboard/lanner/Kconfig.name
new file mode 100644
index 0000000..69026c5
--- /dev/null
+++ b/src/mainboard/lanner/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_LANNER
+	bool "Lanner"
diff --git a/src/mainboard/lanner/em8510/Kconfig.name b/src/mainboard/lanner/em8510/Kconfig.name
new file mode 100644
index 0000000..1ab59af
--- /dev/null
+++ b/src/mainboard/lanner/em8510/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LANNER_EM8510
+	bool "EM-8510"
diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig
index 95f7cfd..a57b462 100644
--- a/src/mainboard/lenovo/Kconfig
+++ b/src/mainboard/lenovo/Kconfig
@@ -3,81 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_LENOVO_X60
-	bool "ThinkPad X60 / X60s / X60t"
-	help
-	  The following X60 series ThinkPad machines have been verified to
-	  work correctly:
-
-	    ThinkPad X60s (Model 1702, 1703)
-	    ThinkPad X60  (Model 1709)
-
-config BOARD_LENOVO_X200
-	bool "ThinkPad X200"
-	help
-	  Lenovo X200 laptop. Consult wiki for details.
-
-config BOARD_LENOVO_X201
-	bool "ThinkPad X201 / X201s / X201t"
-	help
-	  Lenovo X201 laptop. Consult wiki for details.
-
-config BOARD_LENOVO_X220
-	bool "ThinkPad X220"
-	help
-	  Lenovo X220 laptop. Consult wiki for details.
-
-config BOARD_LENOVO_X230
-	bool "ThinkPad X230"
-	help
-	  Lenovo X230 laptop. Consult wiki for details.
-
-config BOARD_LENOVO_T420S
-	bool "ThinkPad T420s"
-	help
-	  Lenovo T420s laptop. Consult wiki for details.
-
-config BOARD_LENOVO_T430S
-	bool "ThinkPad T430s"
-	help
-	  Lenovo T430s laptop. Consult wiki for details.
-
-config BOARD_LENOVO_T520
-	bool "ThinkPad T520"
-	help
-	  Lenovo T520 laptop. Consult wiki for details.
-
-config BOARD_LENOVO_T530
-	bool "ThinkPad T530"
-	help
-	  Lenovo T530 laptop. Consult wiki for details.
-
-config BOARD_LENOVO_T60
-	bool "ThinkPad T60 / T60p"
-	help
-	  The following T60 series ThinkPad machines have been verified to
-          work correctly:
-
-	    Thinkpad T60p (Model 2007)
-
-config BOARD_LENOVO_G505S
-	bool "AMD G505s"
-	help
-	  Lenovo G505s
+source "src/mainboard/lenovo/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/lenovo/x60/Kconfig"
-source "src/mainboard/lenovo/x200/Kconfig"
-source "src/mainboard/lenovo/x201/Kconfig"
-source "src/mainboard/lenovo/x220/Kconfig"
-source "src/mainboard/lenovo/x230/Kconfig"
-source "src/mainboard/lenovo/t420s/Kconfig"
-source "src/mainboard/lenovo/t430s/Kconfig"
-source "src/mainboard/lenovo/t520/Kconfig"
-source "src/mainboard/lenovo/t530/Kconfig"
-source "src/mainboard/lenovo/t60/Kconfig"
-source "src/mainboard/lenovo/g505s/Kconfig"
+source "src/mainboard/lenovo/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/lenovo/Kconfig.name b/src/mainboard/lenovo/Kconfig.name
new file mode 100644
index 0000000..82596e6
--- /dev/null
+++ b/src/mainboard/lenovo/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_LENOVO
+	bool "Lenovo"
diff --git a/src/mainboard/lenovo/g505s/Kconfig.name b/src/mainboard/lenovo/g505s/Kconfig.name
new file mode 100644
index 0000000..ff3ca28
--- /dev/null
+++ b/src/mainboard/lenovo/g505s/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_G505S
+	bool "AMD G505s"
diff --git a/src/mainboard/lenovo/t420s/Kconfig.name b/src/mainboard/lenovo/t420s/Kconfig.name
new file mode 100644
index 0000000..648688b
--- /dev/null
+++ b/src/mainboard/lenovo/t420s/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_T420S
+	bool "ThinkPad T420s"
diff --git a/src/mainboard/lenovo/t430s/Kconfig.name b/src/mainboard/lenovo/t430s/Kconfig.name
new file mode 100644
index 0000000..f940249
--- /dev/null
+++ b/src/mainboard/lenovo/t430s/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_T430S
+	bool "ThinkPad T430s"
diff --git a/src/mainboard/lenovo/t520/Kconfig.name b/src/mainboard/lenovo/t520/Kconfig.name
new file mode 100644
index 0000000..c1b1bff
--- /dev/null
+++ b/src/mainboard/lenovo/t520/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_T520
+	bool "ThinkPad T520"
diff --git a/src/mainboard/lenovo/t530/Kconfig.name b/src/mainboard/lenovo/t530/Kconfig.name
new file mode 100644
index 0000000..b5dee66
--- /dev/null
+++ b/src/mainboard/lenovo/t530/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_T530
+	bool "ThinkPad T530"
diff --git a/src/mainboard/lenovo/t60/Kconfig.name b/src/mainboard/lenovo/t60/Kconfig.name
new file mode 100644
index 0000000..f02fc3d
--- /dev/null
+++ b/src/mainboard/lenovo/t60/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_T60
+	bool "ThinkPad T60 / T60p"
diff --git a/src/mainboard/lenovo/x200/Kconfig.name b/src/mainboard/lenovo/x200/Kconfig.name
new file mode 100644
index 0000000..bda1c1f
--- /dev/null
+++ b/src/mainboard/lenovo/x200/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_X200
+	bool "ThinkPad X200"
diff --git a/src/mainboard/lenovo/x201/Kconfig.name b/src/mainboard/lenovo/x201/Kconfig.name
new file mode 100644
index 0000000..b9bb7af
--- /dev/null
+++ b/src/mainboard/lenovo/x201/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_X201
+	bool "ThinkPad X201 / X201s / X201t"
diff --git a/src/mainboard/lenovo/x220/Kconfig.name b/src/mainboard/lenovo/x220/Kconfig.name
new file mode 100644
index 0000000..0eb3c32
--- /dev/null
+++ b/src/mainboard/lenovo/x220/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_X220
+	bool "ThinkPad X220"
diff --git a/src/mainboard/lenovo/x230/Kconfig.name b/src/mainboard/lenovo/x230/Kconfig.name
new file mode 100644
index 0000000..d207653
--- /dev/null
+++ b/src/mainboard/lenovo/x230/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_X230
+	bool "ThinkPad X230"
diff --git a/src/mainboard/lenovo/x60/Kconfig.name b/src/mainboard/lenovo/x60/Kconfig.name
new file mode 100644
index 0000000..74f79cd
--- /dev/null
+++ b/src/mainboard/lenovo/x60/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_X60
+	bool "ThinkPad X60 / X60s / X60t"
diff --git a/src/mainboard/linutop/Kconfig b/src/mainboard/linutop/Kconfig
index 75b657a..796777b 100644
--- a/src/mainboard/linutop/Kconfig
+++ b/src/mainboard/linutop/Kconfig
@@ -3,8 +3,7 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_LINUTOP_LINUTOP1
-	bool "Linutop-1"
+source "src/mainboard/linutop/*/Kconfig.name"
 
 endchoice
 
@@ -12,6 +11,6 @@
 	string
 	default "Linutop"
 
-source "src/mainboard/linutop/linutop1/Kconfig"
+source "src/mainboard/linutop/*/Kconfig"
 
 endif # VENDOR_LINUTOP
diff --git a/src/mainboard/linutop/Kconfig.name b/src/mainboard/linutop/Kconfig.name
new file mode 100644
index 0000000..34f538d
--- /dev/null
+++ b/src/mainboard/linutop/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_LINUTOP
+	bool "Linutop"
diff --git a/src/mainboard/linutop/linutop1/Kconfig.name b/src/mainboard/linutop/linutop1/Kconfig.name
new file mode 100644
index 0000000..d1cface
--- /dev/null
+++ b/src/mainboard/linutop/linutop1/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LINUTOP_LINUTOP1
+	bool "Linutop-1"
diff --git a/src/mainboard/lippert/Kconfig b/src/mainboard/lippert/Kconfig
index 5d69aae..76cf305 100644
--- a/src/mainboard/lippert/Kconfig
+++ b/src/mainboard/lippert/Kconfig
@@ -5,30 +5,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_LIPPERT_FRONTRUNNER
-	bool "Cool FrontRunner"
-config BOARD_LIPPERT_FRONTRUNNER_AF
-	bool "FrontRunner-AF aka ADLINK CoreModule2-GF"
-config BOARD_LIPPERT_HURRICANE_LX
-	bool "Hurricane-LX"
-config BOARD_LIPPERT_LITERUNNER_LX
-	bool "Cool LiteRunner-LX"
-config BOARD_LIPPERT_ROADRUNNER_LX
-	bool "Cool RoadRunner-LX"
-config BOARD_LIPPERT_SPACERUNNER_LX
-	bool "Cool SpaceRunner-LX"
-config BOARD_LIPPERT_TOUCAN_AF
-	bool "Toucan-AF aka cExpress-GFR (+W83627DHG SIO)"
+source "src/mainboard/lippert/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/lippert/frontrunner/Kconfig"
-source "src/mainboard/lippert/frontrunner-af/Kconfig"
-source "src/mainboard/lippert/hurricane-lx/Kconfig"
-source "src/mainboard/lippert/literunner-lx/Kconfig"
-source "src/mainboard/lippert/roadrunner-lx/Kconfig"
-source "src/mainboard/lippert/spacerunner-lx/Kconfig"
-source "src/mainboard/lippert/toucan-af/Kconfig"
+source "src/mainboard/lippert/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/lippert/Kconfig.name b/src/mainboard/lippert/Kconfig.name
new file mode 100644
index 0000000..9a0c11c
--- /dev/null
+++ b/src/mainboard/lippert/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_LIPPERT
+	bool "LiPPERT"
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig.name b/src/mainboard/lippert/frontrunner-af/Kconfig.name
new file mode 100644
index 0000000..2a8cba5
--- /dev/null
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_FRONTRUNNER_AF
+	bool "FrontRunner-AF aka ADLINK CoreModule2-GF"
diff --git a/src/mainboard/lippert/frontrunner/Kconfig.name b/src/mainboard/lippert/frontrunner/Kconfig.name
new file mode 100644
index 0000000..4024a7b
--- /dev/null
+++ b/src/mainboard/lippert/frontrunner/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_FRONTRUNNER
+	bool "Cool FrontRunner"
diff --git a/src/mainboard/lippert/hurricane-lx/Kconfig.name b/src/mainboard/lippert/hurricane-lx/Kconfig.name
new file mode 100644
index 0000000..810fd44
--- /dev/null
+++ b/src/mainboard/lippert/hurricane-lx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_HURRICANE_LX
+	bool "Hurricane-LX"
diff --git a/src/mainboard/lippert/literunner-lx/Kconfig.name b/src/mainboard/lippert/literunner-lx/Kconfig.name
new file mode 100644
index 0000000..1e44fe4
--- /dev/null
+++ b/src/mainboard/lippert/literunner-lx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_LITERUNNER_LX
+	bool "Cool LiteRunner-LX"
diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig.name b/src/mainboard/lippert/roadrunner-lx/Kconfig.name
new file mode 100644
index 0000000..e7185da
--- /dev/null
+++ b/src/mainboard/lippert/roadrunner-lx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_ROADRUNNER_LX
+	bool "Cool RoadRunner-LX"
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig.name b/src/mainboard/lippert/spacerunner-lx/Kconfig.name
new file mode 100644
index 0000000..85eec96
--- /dev/null
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_SPACERUNNER_LX
+	bool "Cool SpaceRunner-LX"
diff --git a/src/mainboard/lippert/toucan-af/Kconfig.name b/src/mainboard/lippert/toucan-af/Kconfig.name
new file mode 100644
index 0000000..3481f92
--- /dev/null
+++ b/src/mainboard/lippert/toucan-af/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LIPPERT_TOUCAN_AF
+	bool "Toucan-AF aka cExpress-GFR (+W83627DHG SIO)"
diff --git a/src/mainboard/mitac/6513wu/Kconfig.name b/src/mainboard/mitac/6513wu/Kconfig.name
new file mode 100644
index 0000000..bee249a
--- /dev/null
+++ b/src/mainboard/mitac/6513wu/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MITAC_6513WU
+	bool "6513WU"
diff --git a/src/mainboard/mitac/Kconfig b/src/mainboard/mitac/Kconfig
index 3abb9ff..9db1184 100644
--- a/src/mainboard/mitac/Kconfig
+++ b/src/mainboard/mitac/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_MITAC_6513WU
-	bool "6513WU"
+source "src/mainboard/mitac/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/mitac/6513wu/Kconfig"
+source "src/mainboard/mitac/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/mitac/Kconfig.name b/src/mainboard/mitac/Kconfig.name
new file mode 100644
index 0000000..f9c1c4b
--- /dev/null
+++ b/src/mainboard/mitac/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_MITAC
+	bool "Mitac"
diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig
index 8052c4f..60a2ade 100644
--- a/src/mainboard/msi/Kconfig
+++ b/src/mainboard/msi/Kconfig
@@ -21,36 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_MSI_MS_6119
-	bool "MS-6119"
-config BOARD_MSI_MS_6147
-	bool "MS-6147"
-config BOARD_MSI_MS_6156
-	bool "MS-6156"
-config BOARD_MSI_MS_6178
-	bool "MS-6178"
-config BOARD_MSI_MS7135
-	bool "MS-7135 (K8N Neo3)"
-config BOARD_MSI_MS7260
-	bool "MS-7260 (K9N Neo)"
-config BOARD_MSI_MS9185
-	bool "MS-9185 (K9SD Master-S2R)"
-config BOARD_MSI_MS9282
-	bool "MS-9282 (K9SD Master)"
-config BOARD_MSI_MS9652_FAM10
-	bool "MS-9652 Fam10 (Speedster K9ND)"
+source "src/mainboard/msi/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/msi/ms6119/Kconfig"
-source "src/mainboard/msi/ms6147/Kconfig"
-source "src/mainboard/msi/ms6156/Kconfig"
-source "src/mainboard/msi/ms6178/Kconfig"
-source "src/mainboard/msi/ms7135/Kconfig"
-source "src/mainboard/msi/ms7260/Kconfig"
-source "src/mainboard/msi/ms9185/Kconfig"
-source "src/mainboard/msi/ms9282/Kconfig"
-source "src/mainboard/msi/ms9652_fam10/Kconfig"
+source "src/mainboard/msi/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/msi/Kconfig.name b/src/mainboard/msi/Kconfig.name
new file mode 100644
index 0000000..3f4668f
--- /dev/null
+++ b/src/mainboard/msi/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_MSI
+	bool "MSI"
diff --git a/src/mainboard/msi/ms6119/Kconfig.name b/src/mainboard/msi/ms6119/Kconfig.name
new file mode 100644
index 0000000..8517e6b
--- /dev/null
+++ b/src/mainboard/msi/ms6119/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS_6119
+	bool "MS-6119"
diff --git a/src/mainboard/msi/ms6147/Kconfig.name b/src/mainboard/msi/ms6147/Kconfig.name
new file mode 100644
index 0000000..a01b8c2
--- /dev/null
+++ b/src/mainboard/msi/ms6147/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS_6147
+	bool "MS-6147"
diff --git a/src/mainboard/msi/ms6156/Kconfig.name b/src/mainboard/msi/ms6156/Kconfig.name
new file mode 100644
index 0000000..e1f1882
--- /dev/null
+++ b/src/mainboard/msi/ms6156/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS_6156
+	bool "MS-6156"
diff --git a/src/mainboard/msi/ms6178/Kconfig.name b/src/mainboard/msi/ms6178/Kconfig.name
new file mode 100644
index 0000000..fbd0fc1
--- /dev/null
+++ b/src/mainboard/msi/ms6178/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS_6178
+	bool "MS-6178"
diff --git a/src/mainboard/msi/ms7135/Kconfig.name b/src/mainboard/msi/ms7135/Kconfig.name
new file mode 100644
index 0000000..d087e68
--- /dev/null
+++ b/src/mainboard/msi/ms7135/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS7135
+	bool "MS-7135 (K8N Neo3)"
diff --git a/src/mainboard/msi/ms7260/Kconfig.name b/src/mainboard/msi/ms7260/Kconfig.name
new file mode 100644
index 0000000..f5be5e9
--- /dev/null
+++ b/src/mainboard/msi/ms7260/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS7260
+	bool "MS-7260 (K9N Neo)"
diff --git a/src/mainboard/msi/ms9185/Kconfig.name b/src/mainboard/msi/ms9185/Kconfig.name
new file mode 100644
index 0000000..00594c0
--- /dev/null
+++ b/src/mainboard/msi/ms9185/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS9185
+	bool "MS-9185 (K9SD Master-S2R)"
diff --git a/src/mainboard/msi/ms9282/Kconfig.name b/src/mainboard/msi/ms9282/Kconfig.name
new file mode 100644
index 0000000..260c7de
--- /dev/null
+++ b/src/mainboard/msi/ms9282/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS9282
+	bool "MS-9282 (K9SD Master)"
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig.name b/src/mainboard/msi/ms9652_fam10/Kconfig.name
new file mode 100644
index 0000000..3c6659c
--- /dev/null
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_MSI_MS9652_FAM10
+	bool "MS-9652 Fam10 (Speedster K9ND)"
diff --git a/src/mainboard/nec/Kconfig b/src/mainboard/nec/Kconfig
index 525121f..30a2c67 100644
--- a/src/mainboard/nec/Kconfig
+++ b/src/mainboard/nec/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_NEC_POWERMATE_2000
-	bool "PowerMate 2000"
+source "src/mainboard/nec/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/nec/powermate2000/Kconfig"
+source "src/mainboard/nec/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/nec/Kconfig.name b/src/mainboard/nec/Kconfig.name
new file mode 100644
index 0000000..5f4f892
--- /dev/null
+++ b/src/mainboard/nec/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_NEC
+	bool "NEC"
diff --git a/src/mainboard/nec/powermate2000/Kconfig.name b/src/mainboard/nec/powermate2000/Kconfig.name
new file mode 100644
index 0000000..3f46dce
--- /dev/null
+++ b/src/mainboard/nec/powermate2000/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_NEC_POWERMATE_2000
+	bool "PowerMate 2000"
diff --git a/src/mainboard/newisys/Kconfig b/src/mainboard/newisys/Kconfig
index 2870c41..e883488 100644
--- a/src/mainboard/newisys/Kconfig
+++ b/src/mainboard/newisys/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_NEWISYS_KHEPRI
-	bool "Khephri - 2100 Server (SUN Fire v20z)"
+source "src/mainboard/newisys/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/newisys/khepri/Kconfig"
+source "src/mainboard/newisys/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/newisys/Kconfig.name b/src/mainboard/newisys/Kconfig.name
new file mode 100644
index 0000000..8cae8ba
--- /dev/null
+++ b/src/mainboard/newisys/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_NEWISYS
+	bool "Newisys"
diff --git a/src/mainboard/newisys/khepri/Kconfig.name b/src/mainboard/newisys/khepri/Kconfig.name
new file mode 100644
index 0000000..943ade3
--- /dev/null
+++ b/src/mainboard/newisys/khepri/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_NEWISYS_KHEPRI
+	bool "Khephri - 2100 Server (SUN Fire v20z)"
diff --git a/src/mainboard/nokia/Kconfig b/src/mainboard/nokia/Kconfig
index 7239fd4..a0c615b 100644
--- a/src/mainboard/nokia/Kconfig
+++ b/src/mainboard/nokia/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_NOKIA_IP530
-	bool "IP530"
+source "src/mainboard/nokia/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/nokia/ip530/Kconfig"
+source "src/mainboard/nokia/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/nokia/Kconfig.name b/src/mainboard/nokia/Kconfig.name
new file mode 100644
index 0000000..64c55b0
--- /dev/null
+++ b/src/mainboard/nokia/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_NOKIA
+	bool "Nokia"
diff --git a/src/mainboard/nokia/ip530/Kconfig.name b/src/mainboard/nokia/ip530/Kconfig.name
new file mode 100644
index 0000000..22367d3
--- /dev/null
+++ b/src/mainboard/nokia/ip530/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_NOKIA_IP530
+	bool "IP530"
diff --git a/src/mainboard/nvidia/Kconfig b/src/mainboard/nvidia/Kconfig
index d755719..b06b728 100644
--- a/src/mainboard/nvidia/Kconfig
+++ b/src/mainboard/nvidia/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_NVIDIA_L1_2PVV
-	bool "l1_2pvv"
+source "src/mainboard/nvidia/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/nvidia/l1_2pvv/Kconfig"
+source "src/mainboard/nvidia/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/nvidia/Kconfig.name b/src/mainboard/nvidia/Kconfig.name
new file mode 100644
index 0000000..44b0fa6
--- /dev/null
+++ b/src/mainboard/nvidia/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_NVIDIA
+	bool "NVIDIA"
diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig.name b/src/mainboard/nvidia/l1_2pvv/Kconfig.name
new file mode 100644
index 0000000..40dffc6
--- /dev/null
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_NVIDIA_L1_2PVV
+	bool "l1_2pvv"
diff --git a/src/mainboard/packardbell/Kconfig b/src/mainboard/packardbell/Kconfig
index d0712ae..7fe8d24 100644
--- a/src/mainboard/packardbell/Kconfig
+++ b/src/mainboard/packardbell/Kconfig
@@ -3,14 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_PACKARDBELL_MS2290
-	bool "EasyNote LM85 (MS2290)"
-	help
-	  EasyNote LM85 laptop
+source "src/mainboard/packardbell/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/packardbell/ms2290/Kconfig"
+source "src/mainboard/packardbell/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/packardbell/Kconfig.name b/src/mainboard/packardbell/Kconfig.name
new file mode 100644
index 0000000..d379481
--- /dev/null
+++ b/src/mainboard/packardbell/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_PACKARDBELL
+	bool "Packard Bell"
diff --git a/src/mainboard/packardbell/ms2290/Kconfig.name b/src/mainboard/packardbell/ms2290/Kconfig.name
new file mode 100644
index 0000000..a65c758
--- /dev/null
+++ b/src/mainboard/packardbell/ms2290/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_PACKARDBELL_MS2290
+	bool "EasyNote LM85 (MS2290)"
diff --git a/src/mainboard/pcengines/Kconfig b/src/mainboard/pcengines/Kconfig
index a20561b..e173054 100644
--- a/src/mainboard/pcengines/Kconfig
+++ b/src/mainboard/pcengines/Kconfig
@@ -3,24 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_PCENGINES_ALIX1C
-	bool "ALIX.1C"
-config BOARD_PCENGINES_ALIX2C
-	bool "ALIX.2C2 or 2C3"
-config BOARD_PCENGINES_ALIX2D
-	bool "ALIX.2D2 or 2D3"
-config BOARD_PCENGINES_ALIX6
-	bool "ALIX.6"
-config BOARD_PCENGINES_APU1
-	bool "APU1"
+source "src/mainboard/pcengines/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/pcengines/alix1c/Kconfig"
-source "src/mainboard/pcengines/alix2c/Kconfig"
-source "src/mainboard/pcengines/alix2d/Kconfig"
-source "src/mainboard/pcengines/alix6/Kconfig"
-source "src/mainboard/pcengines/apu1/Kconfig"
+source "src/mainboard/pcengines/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/pcengines/Kconfig.name b/src/mainboard/pcengines/Kconfig.name
new file mode 100644
index 0000000..4368086
--- /dev/null
+++ b/src/mainboard/pcengines/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_PCENGINES
+	bool "PC Engines"
diff --git a/src/mainboard/pcengines/alix1c/Kconfig.name b/src/mainboard/pcengines/alix1c/Kconfig.name
new file mode 100644
index 0000000..9b2a7ef
--- /dev/null
+++ b/src/mainboard/pcengines/alix1c/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_PCENGINES_ALIX1C
+	bool "ALIX.1C"
diff --git a/src/mainboard/pcengines/alix2c/Kconfig.name b/src/mainboard/pcengines/alix2c/Kconfig.name
new file mode 100644
index 0000000..7583019
--- /dev/null
+++ b/src/mainboard/pcengines/alix2c/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_PCENGINES_ALIX2C
+	bool "ALIX.2C2 or 2C3"
diff --git a/src/mainboard/pcengines/alix2d/Kconfig.name b/src/mainboard/pcengines/alix2d/Kconfig.name
new file mode 100644
index 0000000..142256e
--- /dev/null
+++ b/src/mainboard/pcengines/alix2d/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_PCENGINES_ALIX2D
+	bool "ALIX.2D2 or 2D3"
diff --git a/src/mainboard/pcengines/alix6/Kconfig.name b/src/mainboard/pcengines/alix6/Kconfig.name
new file mode 100644
index 0000000..c1e77e3
--- /dev/null
+++ b/src/mainboard/pcengines/alix6/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_PCENGINES_ALIX6
+	bool "ALIX.6"
diff --git a/src/mainboard/pcengines/apu1/Kconfig.name b/src/mainboard/pcengines/apu1/Kconfig.name
new file mode 100644
index 0000000..265f7a6
--- /dev/null
+++ b/src/mainboard/pcengines/apu1/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_PCENGINES_APU1
+	bool "APU1"
diff --git a/src/mainboard/rca/Kconfig b/src/mainboard/rca/Kconfig
index c5c9fa6..d5728f2 100644
--- a/src/mainboard/rca/Kconfig
+++ b/src/mainboard/rca/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_RCA_RM4100
-	bool "RM4100"
+source "src/mainboard/rca/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/rca/rm4100/Kconfig"
+source "src/mainboard/rca/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/rca/Kconfig.name b/src/mainboard/rca/Kconfig.name
new file mode 100644
index 0000000..3534996
--- /dev/null
+++ b/src/mainboard/rca/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_RCA
+	bool "RCA"
diff --git a/src/mainboard/rca/rm4100/Kconfig.name b/src/mainboard/rca/rm4100/Kconfig.name
new file mode 100644
index 0000000..fd737ab
--- /dev/null
+++ b/src/mainboard/rca/rm4100/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_RCA_RM4100
+	bool "RM4100"
diff --git a/src/mainboard/roda/Kconfig b/src/mainboard/roda/Kconfig
index b70ce33..8a0107a 100644
--- a/src/mainboard/roda/Kconfig
+++ b/src/mainboard/roda/Kconfig
@@ -3,16 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_RODA_RK886EX
-	bool "RK886EX"
-
-config BOARD_RODA_RK9
-	bool "RK9"
+source "src/mainboard/roda/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/roda/rk886ex/Kconfig"
-source "src/mainboard/roda/rk9/Kconfig"
+source "src/mainboard/roda/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/roda/Kconfig.name b/src/mainboard/roda/Kconfig.name
new file mode 100644
index 0000000..cb8ba8c
--- /dev/null
+++ b/src/mainboard/roda/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_RODA
+	bool "Roda"
diff --git a/src/mainboard/roda/rk886ex/Kconfig.name b/src/mainboard/roda/rk886ex/Kconfig.name
new file mode 100644
index 0000000..f41fb9c
--- /dev/null
+++ b/src/mainboard/roda/rk886ex/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_RODA_RK886EX
+	bool "RK886EX"
diff --git a/src/mainboard/roda/rk9/Kconfig.name b/src/mainboard/roda/rk9/Kconfig.name
new file mode 100644
index 0000000..f93e500
--- /dev/null
+++ b/src/mainboard/roda/rk9/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_RODA_RK9
+	bool "RK9"
diff --git a/src/mainboard/samsung/Kconfig b/src/mainboard/samsung/Kconfig
index d6992d9..06e22d9 100644
--- a/src/mainboard/samsung/Kconfig
+++ b/src/mainboard/samsung/Kconfig
@@ -3,16 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_SAMSUNG_LUMPY
-	bool "Lumpy"
-
-config BOARD_SAMSUNG_STUMPY
-	bool "Stumpy"
+source "src/mainboard/samsung/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/samsung/lumpy/Kconfig"
-source "src/mainboard/samsung/stumpy/Kconfig"
+source "src/mainboard/samsung/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/samsung/Kconfig.name b/src/mainboard/samsung/Kconfig.name
new file mode 100644
index 0000000..c60fd96
--- /dev/null
+++ b/src/mainboard/samsung/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_SAMSUNG
+	bool "SAMSUNG"
diff --git a/src/mainboard/samsung/lumpy/Kconfig.name b/src/mainboard/samsung/lumpy/Kconfig.name
new file mode 100644
index 0000000..66f1fc4
--- /dev/null
+++ b/src/mainboard/samsung/lumpy/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SAMSUNG_LUMPY
+	bool "Lumpy"
diff --git a/src/mainboard/samsung/stumpy/Kconfig.name b/src/mainboard/samsung/stumpy/Kconfig.name
new file mode 100644
index 0000000..aae7c1c
--- /dev/null
+++ b/src/mainboard/samsung/stumpy/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SAMSUNG_STUMPY
+	bool "Stumpy"
diff --git a/src/mainboard/siemens/Kconfig b/src/mainboard/siemens/Kconfig
index e25cfa5..9b7c597 100644
--- a/src/mainboard/siemens/Kconfig
+++ b/src/mainboard/siemens/Kconfig
@@ -3,16 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_SIEMENS_SITEMP_G1P1
-	bool "MB SITEMP-G1 (U1P0/U1P1)"
-
-config BOARD_SIEMENS_MC_TCU3
-	bool "MB TCU3"
+source "src/mainboard/siemens/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/siemens/sitemp_g1p1/Kconfig"
-source "src/mainboard/siemens/mc_tcu3/Kconfig"
+source "src/mainboard/siemens/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/siemens/Kconfig.name b/src/mainboard/siemens/Kconfig.name
new file mode 100644
index 0000000..971bcf6
--- /dev/null
+++ b/src/mainboard/siemens/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_SIEMENS
+	bool "Siemens"
diff --git a/src/mainboard/siemens/mc_tcu3/Kconfig.name b/src/mainboard/siemens/mc_tcu3/Kconfig.name
new file mode 100644
index 0000000..cf644e5
--- /dev/null
+++ b/src/mainboard/siemens/mc_tcu3/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SIEMENS_MC_TCU3
+	bool "MB TCU3"
diff --git a/src/mainboard/siemens/sitemp_g1p1/Kconfig.name b/src/mainboard/siemens/sitemp_g1p1/Kconfig.name
new file mode 100644
index 0000000..4c48ecb
--- /dev/null
+++ b/src/mainboard/siemens/sitemp_g1p1/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SIEMENS_SITEMP_G1P1
+	bool "MB SITEMP-G1 (U1P0/U1P1)"
diff --git a/src/mainboard/soyo/Kconfig b/src/mainboard/soyo/Kconfig
index 4487b81..02174b0 100644
--- a/src/mainboard/soyo/Kconfig
+++ b/src/mainboard/soyo/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_SOYO_SY_6BA_PLUS_III
-	bool "SY-6BA+ III"
+source "src/mainboard/soyo/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/soyo/sy-6ba-plus-iii/Kconfig"
+source "src/mainboard/soyo/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/soyo/Kconfig.name b/src/mainboard/soyo/Kconfig.name
new file mode 100644
index 0000000..33f29ff
--- /dev/null
+++ b/src/mainboard/soyo/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_SOYO
+	bool "Soyo"
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig.name b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig.name
new file mode 100644
index 0000000..05f55a1
--- /dev/null
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SOYO_SY_6BA_PLUS_III
+	bool "SY-6BA+ III"
diff --git a/src/mainboard/sunw/Kconfig b/src/mainboard/sunw/Kconfig
index 0ee7f2e..ea76e23 100644
--- a/src/mainboard/sunw/Kconfig
+++ b/src/mainboard/sunw/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_SUNW_ULTRA40
-	bool "Ultra 40"
+source "src/mainboard/sunw/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/sunw/ultra40/Kconfig"
+source "src/mainboard/sunw/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/sunw/Kconfig.name b/src/mainboard/sunw/Kconfig.name
new file mode 100644
index 0000000..c3783a3
--- /dev/null
+++ b/src/mainboard/sunw/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_SUNW
+	bool "Sun Microsystems"
diff --git a/src/mainboard/sunw/ultra40/Kconfig.name b/src/mainboard/sunw/ultra40/Kconfig.name
new file mode 100644
index 0000000..7a4f562
--- /dev/null
+++ b/src/mainboard/sunw/ultra40/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUNW_ULTRA40
+	bool "Ultra 40"
diff --git a/src/mainboard/supermicro/Kconfig b/src/mainboard/supermicro/Kconfig
index aaa16b3..2ee9372 100644
--- a/src/mainboard/supermicro/Kconfig
+++ b/src/mainboard/supermicro/Kconfig
@@ -3,33 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_SUPERMICRO_H8DME
-	bool "H8DME-2"
-config BOARD_SUPERMICRO_H8DMR
-	bool "H8DMR-i2"
-config BOARD_SUPERMICRO_H8DMR_FAM10
-	bool "H8DMR-i2 (Fam10)"
-config BOARD_SUPERMICRO_H8QME_FAM10
-	bool "H8QME-2+ (Fam10)"
-config BOARD_SUPERMICRO_H8SCM_FAM10
-	bool "H8SCM (Fam10)"
-config BOARD_SUPERMICRO_H8SCM
-        bool "H8SCM"
-config BOARD_SUPERMICRO_H8QGI
-	bool "H8QGI"
-config BOARD_SUPERMICRO_X7DB8
-	bool "X7DB8 / X7DB8+"
+source "src/mainboard/supermicro/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/supermicro/h8dme/Kconfig"
-source "src/mainboard/supermicro/h8dmr/Kconfig"
-source "src/mainboard/supermicro/h8dmr_fam10/Kconfig"
-source "src/mainboard/supermicro/h8qme_fam10/Kconfig"
-source "src/mainboard/supermicro/h8scm_fam10/Kconfig"
-source "src/mainboard/supermicro/h8scm/Kconfig"
-source "src/mainboard/supermicro/h8qgi/Kconfig"
-source "src/mainboard/supermicro/x7db8/Kconfig"
+source "src/mainboard/supermicro/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/supermicro/Kconfig.name b/src/mainboard/supermicro/Kconfig.name
new file mode 100644
index 0000000..6aa397a
--- /dev/null
+++ b/src/mainboard/supermicro/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_SUPERMICRO
+	bool "Supermicro"
diff --git a/src/mainboard/supermicro/h8dme/Kconfig.name b/src/mainboard/supermicro/h8dme/Kconfig.name
new file mode 100644
index 0000000..867b967
--- /dev/null
+++ b/src/mainboard/supermicro/h8dme/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8DME
+	bool "H8DME-2"
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig.name b/src/mainboard/supermicro/h8dmr/Kconfig.name
new file mode 100644
index 0000000..9754fb6
--- /dev/null
+++ b/src/mainboard/supermicro/h8dmr/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8DMR
+	bool "H8DMR-i2"
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig.name b/src/mainboard/supermicro/h8dmr_fam10/Kconfig.name
new file mode 100644
index 0000000..379d9bb
--- /dev/null
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8DMR_FAM10
+	bool "H8DMR-i2 (Fam10)"
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig.name b/src/mainboard/supermicro/h8qgi/Kconfig.name
new file mode 100644
index 0000000..4211c54
--- /dev/null
+++ b/src/mainboard/supermicro/h8qgi/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8QGI
+	bool "H8QGI"
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig.name b/src/mainboard/supermicro/h8qme_fam10/Kconfig.name
new file mode 100644
index 0000000..d7f1933
--- /dev/null
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8QME_FAM10
+	bool "H8QME-2+ (Fam10)"
diff --git a/src/mainboard/supermicro/h8scm/Kconfig.name b/src/mainboard/supermicro/h8scm/Kconfig.name
new file mode 100644
index 0000000..d502234
--- /dev/null
+++ b/src/mainboard/supermicro/h8scm/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8SCM
+        bool "H8SCM"
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig.name b/src/mainboard/supermicro/h8scm_fam10/Kconfig.name
new file mode 100644
index 0000000..03ff6bc
--- /dev/null
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_H8SCM_FAM10
+	bool "H8SCM (Fam10)"
diff --git a/src/mainboard/supermicro/x7db8/Kconfig.name b/src/mainboard/supermicro/x7db8/Kconfig.name
new file mode 100644
index 0000000..b964bcf
--- /dev/null
+++ b/src/mainboard/supermicro/x7db8/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_SUPERMICRO_X7DB8
+	bool "X7DB8 / X7DB8+"
diff --git a/src/mainboard/technexion/Kconfig b/src/mainboard/technexion/Kconfig
index c85266f..163a4bf 100644
--- a/src/mainboard/technexion/Kconfig
+++ b/src/mainboard/technexion/Kconfig
@@ -3,15 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_TECHNEXION_TIM5690
-	bool "TIM-5690"
-config BOARD_TECHNEXION_TIM8690
-	bool "TIM-8690"
+source "src/mainboard/technexion/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/technexion/tim5690/Kconfig"
-source "src/mainboard/technexion/tim8690/Kconfig"
+source "src/mainboard/technexion/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/technexion/Kconfig.name b/src/mainboard/technexion/Kconfig.name
new file mode 100644
index 0000000..6366ff5
--- /dev/null
+++ b/src/mainboard/technexion/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_TECHNEXION
+	bool "Technexion"
diff --git a/src/mainboard/technexion/tim5690/Kconfig.name b/src/mainboard/technexion/tim5690/Kconfig.name
new file mode 100644
index 0000000..24aad25
--- /dev/null
+++ b/src/mainboard/technexion/tim5690/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TECHNEXION_TIM5690
+	bool "TIM-5690"
diff --git a/src/mainboard/technexion/tim8690/Kconfig.name b/src/mainboard/technexion/tim8690/Kconfig.name
new file mode 100644
index 0000000..6080e4e
--- /dev/null
+++ b/src/mainboard/technexion/tim8690/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TECHNEXION_TIM8690
+	bool "TIM-8690"
diff --git a/src/mainboard/thomson/Kconfig b/src/mainboard/thomson/Kconfig
index c1ba64f..e439ba7 100644
--- a/src/mainboard/thomson/Kconfig
+++ b/src/mainboard/thomson/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_THOMSON_IP1000
-	bool "IP1000"
+source "src/mainboard/thomson/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/thomson/ip1000/Kconfig"
+source "src/mainboard/thomson/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/thomson/Kconfig.name b/src/mainboard/thomson/Kconfig.name
new file mode 100644
index 0000000..b22bbbb
--- /dev/null
+++ b/src/mainboard/thomson/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_THOMSON
+	bool "Thomson"
diff --git a/src/mainboard/thomson/ip1000/Kconfig.name b/src/mainboard/thomson/ip1000/Kconfig.name
new file mode 100644
index 0000000..ad3d884
--- /dev/null
+++ b/src/mainboard/thomson/ip1000/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_THOMSON_IP1000
+	bool "IP1000"
diff --git a/src/mainboard/ti/Kconfig b/src/mainboard/ti/Kconfig
index c4cd8c3..7c3d55c 100644
--- a/src/mainboard/ti/Kconfig
+++ b/src/mainboard/ti/Kconfig
@@ -23,12 +23,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_TI_BEAGLEBONE
-	bool "Beaglebone"
+source "src/mainboard/ti/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/ti/beaglebone/Kconfig"
+source "src/mainboard/ti/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/ti/Kconfig.name b/src/mainboard/ti/Kconfig.name
new file mode 100644
index 0000000..664cf8f
--- /dev/null
+++ b/src/mainboard/ti/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_TI
+	bool "TI"
diff --git a/src/mainboard/ti/beaglebone/Kconfig.name b/src/mainboard/ti/beaglebone/Kconfig.name
new file mode 100644
index 0000000..f03759e
--- /dev/null
+++ b/src/mainboard/ti/beaglebone/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TI_BEAGLEBONE
+	bool "Beaglebone"
diff --git a/src/mainboard/traverse/Kconfig b/src/mainboard/traverse/Kconfig
index bb75535..7dec5e1 100644
--- a/src/mainboard/traverse/Kconfig
+++ b/src/mainboard/traverse/Kconfig
@@ -3,12 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_TRAVERSE_GEOS
-	bool "Geos"
+source "src/mainboard/traverse/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/traverse/geos/Kconfig"
+source "src/mainboard/traverse/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/traverse/Kconfig.name b/src/mainboard/traverse/Kconfig.name
new file mode 100644
index 0000000..e4763a6
--- /dev/null
+++ b/src/mainboard/traverse/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_TRAVERSE
+	bool "Traverse Technologies"
diff --git a/src/mainboard/traverse/geos/Kconfig.name b/src/mainboard/traverse/geos/Kconfig.name
new file mode 100644
index 0000000..e446fa0
--- /dev/null
+++ b/src/mainboard/traverse/geos/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TRAVERSE_GEOS
+	bool "Geos"
diff --git a/src/mainboard/tyan/Kconfig b/src/mainboard/tyan/Kconfig
index 4a135bd..078c403 100644
--- a/src/mainboard/tyan/Kconfig
+++ b/src/mainboard/tyan/Kconfig
@@ -21,56 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_TYAN_S1846
-	bool "S1846 (Tsunami ATX)"
-config BOARD_TYAN_S2735
-	bool "S2735 (Tiger i7501R)"
-config BOARD_TYAN_S2850
-	bool "S2850 (Tomcat K8S)"
-config BOARD_TYAN_S2875
-	bool "S2875 (Tiger K8W)"
-config BOARD_TYAN_S2880
-	bool "S2880 (Thunder K8S)"
-config BOARD_TYAN_S2881
-	bool "S2881 (Thunder K8SR)"
-config BOARD_TYAN_S2882
-	bool "S2882 (Thunder K8S Pro)"
-config BOARD_TYAN_S2885
-	bool "S2885 (Thunder K8W)"
-config BOARD_TYAN_S2891
-	bool "S2891 (Thunder K8SRE)"
-config BOARD_TYAN_S2892
-	bool "S2892 (Thunder K8SE)"
-config BOARD_TYAN_S2895
-	bool "S2895 (Thunder K8WE)"
-config BOARD_TYAN_S2912
-	bool "S2912 (Thunder n3600R)"
-config BOARD_TYAN_S2912_FAM10
-	bool "S2912 Fam10 (Thunder n3600R)"
-config BOARD_TYAN_S4880
-	bool "S4880 (Thunder K8QS)"
-config BOARD_TYAN_S4882
-	bool "S4882 (Thunder K8QS Pro)"
-config BOARD_TYAN_S8226
-        bool "S8226"
+source "src/mainboard/tyan/*/Kconfig.name"
+
 endchoice
 
-source "src/mainboard/tyan/s1846/Kconfig"
-source "src/mainboard/tyan/s2735/Kconfig"
-source "src/mainboard/tyan/s2850/Kconfig"
-source "src/mainboard/tyan/s2875/Kconfig"
-source "src/mainboard/tyan/s2880/Kconfig"
-source "src/mainboard/tyan/s2881/Kconfig"
-source "src/mainboard/tyan/s2882/Kconfig"
-source "src/mainboard/tyan/s2885/Kconfig"
-source "src/mainboard/tyan/s2891/Kconfig"
-source "src/mainboard/tyan/s2892/Kconfig"
-source "src/mainboard/tyan/s2895/Kconfig"
-source "src/mainboard/tyan/s2912/Kconfig"
-source "src/mainboard/tyan/s2912_fam10/Kconfig"
-source "src/mainboard/tyan/s4880/Kconfig"
-source "src/mainboard/tyan/s4882/Kconfig"
-source "src/mainboard/tyan/s8226/Kconfig"
+source "src/mainboard/tyan/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/tyan/Kconfig.name b/src/mainboard/tyan/Kconfig.name
new file mode 100644
index 0000000..ee21057
--- /dev/null
+++ b/src/mainboard/tyan/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_TYAN
+	bool "Tyan"
diff --git a/src/mainboard/tyan/s1846/Kconfig.name b/src/mainboard/tyan/s1846/Kconfig.name
new file mode 100644
index 0000000..2b68f27
--- /dev/null
+++ b/src/mainboard/tyan/s1846/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S1846
+	bool "S1846 (Tsunami ATX)"
diff --git a/src/mainboard/tyan/s2735/Kconfig.name b/src/mainboard/tyan/s2735/Kconfig.name
new file mode 100644
index 0000000..9f16bf2
--- /dev/null
+++ b/src/mainboard/tyan/s2735/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2735
+	bool "S2735 (Tiger i7501R)"
diff --git a/src/mainboard/tyan/s2850/Kconfig.name b/src/mainboard/tyan/s2850/Kconfig.name
new file mode 100644
index 0000000..2597535
--- /dev/null
+++ b/src/mainboard/tyan/s2850/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2850
+	bool "S2850 (Tomcat K8S)"
diff --git a/src/mainboard/tyan/s2875/Kconfig.name b/src/mainboard/tyan/s2875/Kconfig.name
new file mode 100644
index 0000000..d427aca
--- /dev/null
+++ b/src/mainboard/tyan/s2875/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2875
+	bool "S2875 (Tiger K8W)"
diff --git a/src/mainboard/tyan/s2880/Kconfig.name b/src/mainboard/tyan/s2880/Kconfig.name
new file mode 100644
index 0000000..439e9aa
--- /dev/null
+++ b/src/mainboard/tyan/s2880/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2880
+	bool "S2880 (Thunder K8S)"
diff --git a/src/mainboard/tyan/s2881/Kconfig.name b/src/mainboard/tyan/s2881/Kconfig.name
new file mode 100644
index 0000000..475323e
--- /dev/null
+++ b/src/mainboard/tyan/s2881/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2881
+	bool "S2881 (Thunder K8SR)"
diff --git a/src/mainboard/tyan/s2882/Kconfig.name b/src/mainboard/tyan/s2882/Kconfig.name
new file mode 100644
index 0000000..50f9381
--- /dev/null
+++ b/src/mainboard/tyan/s2882/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2882
+	bool "S2882 (Thunder K8S Pro)"
diff --git a/src/mainboard/tyan/s2885/Kconfig.name b/src/mainboard/tyan/s2885/Kconfig.name
new file mode 100644
index 0000000..15d2333
--- /dev/null
+++ b/src/mainboard/tyan/s2885/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2885
+	bool "S2885 (Thunder K8W)"
diff --git a/src/mainboard/tyan/s2891/Kconfig.name b/src/mainboard/tyan/s2891/Kconfig.name
new file mode 100644
index 0000000..8f45c35
--- /dev/null
+++ b/src/mainboard/tyan/s2891/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2891
+	bool "S2891 (Thunder K8SRE)"
diff --git a/src/mainboard/tyan/s2892/Kconfig.name b/src/mainboard/tyan/s2892/Kconfig.name
new file mode 100644
index 0000000..6e00bae
--- /dev/null
+++ b/src/mainboard/tyan/s2892/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2892
+	bool "S2892 (Thunder K8SE)"
diff --git a/src/mainboard/tyan/s2895/Kconfig.name b/src/mainboard/tyan/s2895/Kconfig.name
new file mode 100644
index 0000000..ff55226
--- /dev/null
+++ b/src/mainboard/tyan/s2895/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2895
+	bool "S2895 (Thunder K8WE)"
diff --git a/src/mainboard/tyan/s2912/Kconfig.name b/src/mainboard/tyan/s2912/Kconfig.name
new file mode 100644
index 0000000..f8f8828
--- /dev/null
+++ b/src/mainboard/tyan/s2912/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2912
+	bool "S2912 (Thunder n3600R)"
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig.name b/src/mainboard/tyan/s2912_fam10/Kconfig.name
new file mode 100644
index 0000000..7113732
--- /dev/null
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S2912_FAM10
+	bool "S2912 Fam10 (Thunder n3600R)"
diff --git a/src/mainboard/tyan/s4880/Kconfig.name b/src/mainboard/tyan/s4880/Kconfig.name
new file mode 100644
index 0000000..2e71996
--- /dev/null
+++ b/src/mainboard/tyan/s4880/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S4880
+	bool "S4880 (Thunder K8QS)"
diff --git a/src/mainboard/tyan/s4882/Kconfig.name b/src/mainboard/tyan/s4882/Kconfig.name
new file mode 100644
index 0000000..81b4a43
--- /dev/null
+++ b/src/mainboard/tyan/s4882/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S4882
+	bool "S4882 (Thunder K8QS Pro)"
diff --git a/src/mainboard/tyan/s8226/Kconfig.name b/src/mainboard/tyan/s8226/Kconfig.name
new file mode 100644
index 0000000..78de0d2
--- /dev/null
+++ b/src/mainboard/tyan/s8226/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_TYAN_S8226
+        bool "S8226"
diff --git a/src/mainboard/via/Kconfig b/src/mainboard/via/Kconfig
index 5d72cc1..d14c758 100644
--- a/src/mainboard/via/Kconfig
+++ b/src/mainboard/via/Kconfig
@@ -3,27 +3,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_VIA_EPIA_CN
-	bool "EPIA-CN"
-config BOARD_VIA_EPIA_M700
-	bool "EPIA-M700"
-config BOARD_VIA_EPIA_M850
-	bool "EPIA-M850"
-	help
-	  STOP RIGHT HERE AND READ THIS!!!
-	  Read http://www.coreboot.org/VIA_EPIA-M850 before you proceed.
-config BOARD_VIA_PC2500E
-	bool "pc2500e"
-config BOARD_VIA_VT8454C
-	bool "VT8454c"
+source "src/mainboard/via/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/via/epia-cn/Kconfig"
-source "src/mainboard/via/epia-m700/Kconfig"
-source "src/mainboard/via/epia-m850/Kconfig"
-source "src/mainboard/via/pc2500e/Kconfig"
-source "src/mainboard/via/vt8454c/Kconfig"
+source "src/mainboard/via/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/via/Kconfig.name b/src/mainboard/via/Kconfig.name
new file mode 100644
index 0000000..9015389
--- /dev/null
+++ b/src/mainboard/via/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_VIA
+	bool "VIA"
diff --git a/src/mainboard/via/epia-cn/Kconfig.name b/src/mainboard/via/epia-cn/Kconfig.name
new file mode 100644
index 0000000..1664fe2
--- /dev/null
+++ b/src/mainboard/via/epia-cn/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_VIA_EPIA_CN
+	bool "EPIA-CN"
diff --git a/src/mainboard/via/epia-m700/Kconfig.name b/src/mainboard/via/epia-m700/Kconfig.name
new file mode 100644
index 0000000..041f8cf
--- /dev/null
+++ b/src/mainboard/via/epia-m700/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_VIA_EPIA_M700
+	bool "EPIA-M700"
diff --git a/src/mainboard/via/epia-m850/Kconfig.name b/src/mainboard/via/epia-m850/Kconfig.name
new file mode 100644
index 0000000..5d6ed61
--- /dev/null
+++ b/src/mainboard/via/epia-m850/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_VIA_EPIA_M850
+	bool "EPIA-M850"
diff --git a/src/mainboard/via/pc2500e/Kconfig.name b/src/mainboard/via/pc2500e/Kconfig.name
new file mode 100644
index 0000000..0de65a7
--- /dev/null
+++ b/src/mainboard/via/pc2500e/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_VIA_PC2500E
+	bool "pc2500e"
diff --git a/src/mainboard/via/vt8454c/Kconfig.name b/src/mainboard/via/vt8454c/Kconfig.name
new file mode 100644
index 0000000..998dbcb
--- /dev/null
+++ b/src/mainboard/via/vt8454c/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_VIA_VT8454C
+	bool "VT8454c"
diff --git a/src/mainboard/winent/Kconfig b/src/mainboard/winent/Kconfig
index 28c3360..01c5cd1 100644
--- a/src/mainboard/winent/Kconfig
+++ b/src/mainboard/winent/Kconfig
@@ -21,16 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_WINENT_MB6047
-	bool "MB6047"
-
-config BOARD_WINENT_PL6064
-	bool "PL6064"
+source "src/mainboard/winent/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/winent/mb6047/Kconfig"
-source "src/mainboard/winent/pl6064/Kconfig"
+source "src/mainboard/winent/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/winent/Kconfig.name b/src/mainboard/winent/Kconfig.name
new file mode 100644
index 0000000..6405d0b
--- /dev/null
+++ b/src/mainboard/winent/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_WINENT
+	bool "Win Enterprises"
diff --git a/src/mainboard/winent/mb6047/Kconfig.name b/src/mainboard/winent/mb6047/Kconfig.name
new file mode 100644
index 0000000..9997dd6
--- /dev/null
+++ b/src/mainboard/winent/mb6047/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_WINENT_MB6047
+	bool "MB6047"
diff --git a/src/mainboard/winent/pl6064/Kconfig.name b/src/mainboard/winent/pl6064/Kconfig.name
new file mode 100644
index 0000000..dad5eb6
--- /dev/null
+++ b/src/mainboard/winent/pl6064/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_WINENT_PL6064
+	bool "PL6064"
diff --git a/src/mainboard/wyse/Kconfig b/src/mainboard/wyse/Kconfig
index 22f76ef..b24e446 100644
--- a/src/mainboard/wyse/Kconfig
+++ b/src/mainboard/wyse/Kconfig
@@ -21,12 +21,11 @@
 choice
 	prompt "Mainboard model"
 
-config BOARD_WYSE_S50
-	bool "S50"
+source "src/mainboard/wyse/*/Kconfig.name"
 
 endchoice
 
-source "src/mainboard/wyse/s50/Kconfig"
+source "src/mainboard/wyse/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string
diff --git a/src/mainboard/wyse/Kconfig.name b/src/mainboard/wyse/Kconfig.name
new file mode 100644
index 0000000..37864fa
--- /dev/null
+++ b/src/mainboard/wyse/Kconfig.name
@@ -0,0 +1,2 @@
+config VENDOR_WYSE
+	bool "Wyse"
diff --git a/src/mainboard/wyse/s50/Kconfig.name b/src/mainboard/wyse/s50/Kconfig.name
new file mode 100644
index 0000000..470e844
--- /dev/null
+++ b/src/mainboard/wyse/s50/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_WYSE_S50
+	bool "S50"