diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index dbd2b8733c..0e543e16e0 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -3,6 +3,26 @@
 config BOARD_GOOGLE_VEYRON
 	def_bool n
 
+config BOARD_GOOGLE_VEYRON_JAQ
+	select BOARD_GOOGLE_VEYRON
+	select SYSTEM_TYPE_LAPTOP
+
+config BOARD_GOOGLE_VEYRON_JERRY
+	select BOARD_GOOGLE_VEYRON
+	select SYSTEM_TYPE_LAPTOP
+
+config BOARD_GOOGLE_VEYRON_MIGHTY
+	select BOARD_GOOGLE_VEYRON
+	select SYSTEM_TYPE_LAPTOP
+
+config BOARD_GOOGLE_VEYRON_MINNIE
+	select BOARD_GOOGLE_VEYRON
+	select SYSTEM_TYPE_LAPTOP
+
+config BOARD_GOOGLE_VEYRON_SPEEDY
+	select BOARD_GOOGLE_VEYRON
+	select SYSTEM_TYPE_LAPTOP
+
 if BOARD_GOOGLE_VEYRON
 
 # Some Veyron boards incorrectly had their RAM code strapped with 100Kohm
diff --git a/src/mainboard/google/veyron/Kconfig.name b/src/mainboard/google/veyron/Kconfig.name
index bf734cc06d..a5c07901ae 100644
--- a/src/mainboard/google/veyron/Kconfig.name
+++ b/src/mainboard/google/veyron/Kconfig.name
@@ -2,25 +2,15 @@ comment "Veyron"
 
 config BOARD_GOOGLE_VEYRON_JAQ
 	bool "->  Veyron_Jaq (Haier Chromebook 11)"
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_VEYRON_JERRY
 	bool "->  Veyron_Jerry (Hisense Chromebook 11)"
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_VEYRON_MIGHTY
 	bool "->  Veyron_Mighty (Haier Chromebook 11(edu))"
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_VEYRON_MINNIE
 	bool "->  Veyron_Minnie (ASUS Chromebook Flip C100)"
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_VEYRON_SPEEDY
 	bool "->  Veyron_Speedy (ASUS C201 Chromebook)"
-	select BOARD_GOOGLE_VEYRON
-	select SYSTEM_TYPE_LAPTOP