1 files changed, 3 insertions, 87 deletions
diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig
index 6e5eb73714..98ec046bfd 100644
--- a/src/mainboard/google/Kconfig
+++ b/src/mainboard/google/Kconfig
@@ -21,95 +21,11 @@ if VENDOR_GOOGLE
 choice
 	prompt "Mainboard model"
 
-config BOARD_GOOGLE_BOLT
-	bool "Bolt"
-config BOARD_GOOGLE_BUTTERFLY
-	bool "Butterfly"
-config BOARD_GOOGLE_COSMOS
-	bool "Cosmos"
-config BOARD_GOOGLE_DAISY
-	bool "Daisy"
-config BOARD_GOOGLE_FALCO
-	bool "Falco"
-config BOARD_GOOGLE_LINK
-	bool "Link"
-config BOARD_GOOGLE_NYAN
-	bool "Nyan"
-config BOARD_GOOGLE_NYAN_BIG
-	bool "Nyan Big"
-config BOARD_GOOGLE_NYAN_BLAZE
-	bool "Nyan Blaze"
-config BOARD_GOOGLE_PANTHER
-	bool "Panther"
-config BOARD_GOOGLE_PARROT
-	bool "Parrot"
-config BOARD_GOOGLE_PEACH_PIT
-	bool "Peach Pit"
-config BOARD_GOOGLE_PEPPY
-	bool "Peppy"
-config BOARD_GOOGLE_PURIN
-	bool "Purin"
-config BOARD_GOOGLE_RAMBI
-	bool "Rambi"
-config BOARD_GOOGLE_RUSH
-	bool "Rush"
-config BOARD_GOOGLE_RUSH_RYU
-	bool "Rush Ryu"
-config BOARD_GOOGLE_SAMUS
-	bool "Samus"
-config BOARD_GOOGLE_SLIPPY
-	bool "Slippy"
-config BOARD_GOOGLE_STORM
-	bool "Storm"
-config BOARD_GOOGLE_STOUT
-	bool "Stout"
-config BOARD_GOOGLE_URARA
-	bool "Urara"
-config BOARD_GOOGLE_VEYRON_BRAIN
-	bool "Veyron_Brain"
-config BOARD_GOOGLE_VEYRON_DANGER
-	bool "Veyron_Danger"
-config BOARD_GOOGLE_VEYRON_JERRY
-	bool "Veyron_Jerry"
-config BOARD_GOOGLE_VEYRON_MIGHTY
-	bool "Veyron_Mighty"
-config BOARD_GOOGLE_VEYRON_PINKY
-	bool "Veyron_Pinky"
-config BOARD_GOOGLE_VEYRON_RIALTO
-        bool "Veyron_Rialto"
-config BOARD_GOOGLE_VEYRON_SPEEDY
-	bool "Veyron_Speedy"
+source "src/mainboard/google/*/Kconfig.name"
+
 endchoice
 
-source "src/mainboard/google/bolt/Kconfig"
-source "src/mainboard/google/butterfly/Kconfig"
-source "src/mainboard/google/cosmos/Kconfig"
-source "src/mainboard/google/daisy/Kconfig"
-source "src/mainboard/google/falco/Kconfig"
-source "src/mainboard/google/link/Kconfig"
-source "src/mainboard/google/nyan/Kconfig"
-source "src/mainboard/google/nyan_big/Kconfig"
-source "src/mainboard/google/nyan_blaze/Kconfig"
-source "src/mainboard/google/panther/Kconfig"
-source "src/mainboard/google/parrot/Kconfig"
-source "src/mainboard/google/peach_pit/Kconfig"
-source "src/mainboard/google/peppy/Kconfig"
-source "src/mainboard/google/purin/Kconfig"
-source "src/mainboard/google/rambi/Kconfig"
-source "src/mainboard/google/rush/Kconfig"
-source "src/mainboard/google/rush_ryu/Kconfig"
-source "src/mainboard/google/samus/Kconfig"
-source "src/mainboard/google/slippy/Kconfig"
-source "src/mainboard/google/storm/Kconfig"
-source "src/mainboard/google/stout/Kconfig"
-source "src/mainboard/google/urara/Kconfig"
-source "src/mainboard/google/veyron_brain/Kconfig"
-source "src/mainboard/google/veyron_danger/Kconfig"
-source "src/mainboard/google/veyron_jerry/Kconfig"
-source "src/mainboard/google/veyron_mighty/Kconfig"
-source "src/mainboard/google/veyron_pinky/Kconfig"
-source "src/mainboard/google/veyron_rialto/Kconfig"
-source "src/mainboard/google/veyron_speedy/Kconfig"
+source "src/mainboard/google/*/Kconfig"
 
 config MAINBOARD_VENDOR
 	string "Mainboard Vendor"