13 files changed, 26 insertions, 72 deletions
diff --git a/src/mainboard/lenovo/Kconfig b/src/mainboard/lenovo/Kconfig
index 95f7cfdfc5..a57b462529 100644
--- a/src/mainboard/lenovo/Kconfig
+++ b/src/mainboard/lenovo/Kconfig
@@ -3,81 +3,11 @@ if VENDOR_LENOVO
 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 0000000000..82596e67ca
--- /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 0000000000..ff3ca28e9b
--- /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 0000000000..648688bc0a
--- /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 0000000000..f940249654
--- /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 0000000000..c1b1bff599
--- /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 0000000000..b5dee66e9a
--- /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 0000000000..f02fc3defe
--- /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 0000000000..bda1c1f487
--- /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 0000000000..b9bb7af605
--- /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 0000000000..0eb3c3201a
--- /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 0000000000..d20765388b
--- /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 0000000000..74f79cd288
--- /dev/null
+++ b/src/mainboard/lenovo/x60/Kconfig.name
@@ -0,0 +1,2 @@
+config BOARD_LENOVO_X60
+	bool "ThinkPad X60 / X60s / X60t"