8 files changed, 16 insertions, 19 deletions
diff --git a/src/mainboard/hp/Kconfig b/src/mainboard/hp/Kconfig
index 3efd1dd29d..9d768ae647 100644
--- a/src/mainboard/hp/Kconfig
+++ b/src/mainboard/hp/Kconfig
@@ -3,28 +3,11 @@ if VENDOR_HP
 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 0000000000..09398e220f
--- /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 0000000000..4ace57323d
--- /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 0000000000..2840287608
--- /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 0000000000..ebbc20fb94
--- /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 0000000000..ceb6e86b14
--- /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 0000000000..f37ab1ef0c
--- /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 0000000000..a736970395
--- /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"