diff --git a/src/mainboard/google/trogdor/Kconfig b/src/mainboard/google/trogdor/Kconfig
index 028dc2b..f7e1afe 100644
--- a/src/mainboard/google/trogdor/Kconfig
+++ b/src/mainboard/google/trogdor/Kconfig
@@ -2,6 +2,45 @@
 config BOARD_GOOGLE_TROGDOR_COMMON  # Umbrella option to be selected by variants
 	def_bool n
 
+config BOARD_GOOGLE_BUBS
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_COACHZ
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_GELARSHIE
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_HOMESTAR
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_KINGOFTOWN
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_LAZOR
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_MARZIPAN
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_MRBLAND
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_PAZQUEL
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_POMPOM
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_QUACKINGSTICK
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_WORMDINGLER
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
+config BOARD_GOOGLE_TROGDOR
+	select BOARD_GOOGLE_TROGDOR_COMMON
+
 if BOARD_GOOGLE_TROGDOR_COMMON
 
 config TROGDOR_REV0
diff --git a/src/mainboard/google/trogdor/Kconfig.name b/src/mainboard/google/trogdor/Kconfig.name
index cc1ffbd..e22159f 100644
--- a/src/mainboard/google/trogdor/Kconfig.name
+++ b/src/mainboard/google/trogdor/Kconfig.name
@@ -2,52 +2,39 @@
 
 config BOARD_GOOGLE_BUBS
 	bool "->  Bubs"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_COACHZ
 	bool "->  Coachz"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_GELARSHIE
 	bool "->  Gelarshie"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_HOMESTAR
 	bool "->  Homestar"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_KINGOFTOWN
 	bool "->  Kingoftown"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_LAZOR
 	bool "->  Lazor"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_MARZIPAN
 	bool "->  Marzipan"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_MRBLAND
 	bool "->  Mrbland"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_PAZQUEL
 	bool "->  Pazquel"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_POMPOM
 	bool "->  Pompom"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_QUACKINGSTICK
 	bool "->  Quackingstick"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_WORMDINGLER
 	bool "->  Wormdingler"
-	select BOARD_GOOGLE_TROGDOR_COMMON
 
 config BOARD_GOOGLE_TROGDOR
 	bool "->  Trogdor"
-	select BOARD_GOOGLE_TROGDOR_COMMON