diff --git a/src/mainboard/lenovo/r400/Kconfig b/src/mainboard/lenovo/r400/Kconfig
deleted file mode 100644
index 0966bf129e..0000000000
--- a/src/mainboard/lenovo/r400/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-if BOARD_LENOVO_R400
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "ThinkPad R400"
-
-endif
diff --git a/src/mainboard/lenovo/r400/Kconfig.name b/src/mainboard/lenovo/r400/Kconfig.name
deleted file mode 100644
index 15a99b1991..0000000000
--- a/src/mainboard/lenovo/r400/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_LENOVO_R400
-	bool "ThinkPad R400"
diff --git a/src/mainboard/lenovo/r400/board_info.txt b/src/mainboard/lenovo/r400/board_info.txt
deleted file mode 100644
index 007ec6cea1..0000000000
--- a/src/mainboard/lenovo/r400/board_info.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Category: laptop
-ROM package: SOIC-16 or SOIC-8
-ROM protocol: SPI
-ROM socketed: n
-Flashrom support: n
-Clone of: lenovo/t400
diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig
index bea87372e8..96f4188f05 100644
--- a/src/mainboard/lenovo/t400/Kconfig
+++ b/src/mainboard/lenovo/t400/Kconfig
@@ -1,4 +1,5 @@
-if BOARD_LENOVO_T400 || BOARD_LENOVO_T500 || BOARD_LENOVO_R400 || BOARD_LENOVO_W500
+if BOARD_LENOVO_T400 || BOARD_LENOVO_T500 || BOARD_LENOVO_R400 \
+	|| BOARD_LENOVO_W500
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -28,13 +29,12 @@ config MAINBOARD_DIR
 	string
 	default lenovo/t400
 
-if BOARD_LENOVO_T400
-
 config MAINBOARD_PART_NUMBER
 	string
-	default "ThinkPad T400"
-
-endif
+	default "ThinkPad T400" if BOARD_LENOVO_T400
+	default "ThinkPad T500" if BOARD_LENOVO_T500
+	default "ThinkPad R400" if BOARD_LENOVO_R400
+	default "ThinkPad W500" if BOARD_LENOVO_W500
 
 config USBDEBUG_HCD_INDEX
 	int
diff --git a/src/mainboard/lenovo/t400/Kconfig.name b/src/mainboard/lenovo/t400/Kconfig.name
index 56a575e317..d459ce9236 100644
--- a/src/mainboard/lenovo/t400/Kconfig.name
+++ b/src/mainboard/lenovo/t400/Kconfig.name
@@ -1,2 +1,11 @@
 config BOARD_LENOVO_T400
 	bool "ThinkPad T400"
+
+config BOARD_LENOVO_T500
+	bool "ThinkPad T500"
+
+config BOARD_LENOVO_R400
+	bool "ThinkPad R400"
+
+config BOARD_LENOVO_W500
+	bool "ThinkPad W500"
diff --git a/src/mainboard/lenovo/t500/Kconfig b/src/mainboard/lenovo/t500/Kconfig
deleted file mode 100644
index e1e8420dab..0000000000
--- a/src/mainboard/lenovo/t500/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-if BOARD_LENOVO_T500
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "ThinkPad T500"
-
-endif
diff --git a/src/mainboard/lenovo/t500/Kconfig.name b/src/mainboard/lenovo/t500/Kconfig.name
deleted file mode 100644
index 89c6087454..0000000000
--- a/src/mainboard/lenovo/t500/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_LENOVO_T500
-	bool "ThinkPad T500"
diff --git a/src/mainboard/lenovo/t500/board_info.txt b/src/mainboard/lenovo/t500/board_info.txt
deleted file mode 100644
index 007ec6cea1..0000000000
--- a/src/mainboard/lenovo/t500/board_info.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Category: laptop
-ROM package: SOIC-16 or SOIC-8
-ROM protocol: SPI
-ROM socketed: n
-Flashrom support: n
-Clone of: lenovo/t400
diff --git a/src/mainboard/lenovo/w500/Kconfig b/src/mainboard/lenovo/w500/Kconfig
deleted file mode 100644
index e9ee3ad275..0000000000
--- a/src/mainboard/lenovo/w500/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-if BOARD_LENOVO_W500
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "ThinkPad W500"
-
-endif
diff --git a/src/mainboard/lenovo/w500/Kconfig.name b/src/mainboard/lenovo/w500/Kconfig.name
deleted file mode 100644
index 2097b779d7..0000000000
--- a/src/mainboard/lenovo/w500/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_LENOVO_W500
-	bool "ThinkPad W500"
diff --git a/src/mainboard/lenovo/w500/board_info.txt b/src/mainboard/lenovo/w500/board_info.txt
deleted file mode 100644
index 007ec6cea1..0000000000
--- a/src/mainboard/lenovo/w500/board_info.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Category: laptop
-ROM package: SOIC-16 or SOIC-8
-ROM protocol: SPI
-ROM socketed: n
-Flashrom support: n
-Clone of: lenovo/t400