2 files changed, 104 insertions, 56 deletions

diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index c540e7adcc..3d04079308 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -42,6 +42,110 @@ config BOARD_GOOGLE_BASEBOARD_PUFF
 	select SOC_INTEL_CSE_LITE_SKU
 	select SPD_READ_BY_WORD
 
+config BOARD_GOOGLE_AKEMI
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_AMBASSADOR
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_DOOLY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_DRATINI
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_DUFFY_LEGACY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_DUFFY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_FAFFY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_GENESIS
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_HATCH
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_HELIOS
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select DRIVERS_I2C_RT1011
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_HELIOS_DISKSWAP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select DRIVERS_I2C_RT1011
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_JINLON
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select DRIVERS_GFX_GENERIC
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_KAISA_LEGACY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_KAISA
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_KINDRED
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select INTEL_GMA_HAVE_VBT
+	select SOC_INTEL_COMMON_MMC_OVERRIDE
+
+config BOARD_GOOGLE_KOHAKU
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_MOONBUGGY
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_MUSHU
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+
+config BOARD_GOOGLE_NIGHTFURY
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select DRIVERS_I2C_MAX98390
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_NOIBAT
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_PALKIA
+	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select DRIVERS_I2C_RT1011
+
+config BOARD_GOOGLE_PUFF
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select BOARD_ROMSIZE_KB_32768
+	select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_SCOUT
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+
+config BOARD_GOOGLE_WYVERN
+	select BOARD_GOOGLE_BASEBOARD_PUFF
+	select INTEL_GMA_HAVE_VBT
+
 if BOARD_GOOGLE_HATCH_COMMON
 
 config CHROMEOS
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index fea4068716..1307314e9a 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -2,128 +2,72 @@ comment "Hatch"
 
 config BOARD_GOOGLE_AKEMI
 	bool "->  Akemi (IdeaPad Flex 5/5i Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_AMBASSADOR
 	bool "->  Ambassador"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
 
 config BOARD_GOOGLE_DOOLY
 	bool "->  Dooly"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_DRATINI
 	bool "->  Dratini (HP Pro c640 Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_DUFFY_LEGACY
 	bool "->  Duffy Legacy (32MB)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_DUFFY
 	bool "->  Duffy (ASUS Chromebox 4)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_FAFFY
 	bool "->  Faffy (ASUS Fanless Chromebox)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_GENESIS
 	bool "->  Genesis"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
 
 config BOARD_GOOGLE_HATCH
 	bool "->  Hatch"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_HELIOS
 	bool "->  Helios (ASUS Chromebook Flip C436FA)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select DRIVERS_I2C_RT1011
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_HELIOS_DISKSWAP
 	bool "->  Helios_Diskswap"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select DRIVERS_I2C_RT1011
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_JINLON
 	bool "->  Jinlon (HP Elite c1030 Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select DRIVERS_GFX_GENERIC
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_KAISA_LEGACY
 	bool "->  Kaisa Legacy (32MB)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_KAISA
 	bool "->  Kaisa (Acer Chromebox CXI4)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_KINDRED
 	bool "->  Kindred (Acer Chromebook 712)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select INTEL_GMA_HAVE_VBT
-	select SOC_INTEL_COMMON_MMC_OVERRIDE
 
 config BOARD_GOOGLE_KOHAKU
 	bool "->  Kohaku (Samsung Galaxy Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_MOONBUGGY
 	bool "->  Moonbuggy"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
 
 config BOARD_GOOGLE_MUSHU
 	bool "->  Mushu"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 
 config BOARD_GOOGLE_NIGHTFURY
 	bool "->  Nightfury (Samsung Galaxy Chromebook 2)"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select DRIVERS_I2C_MAX98390
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_NOIBAT
 	bool "->  Noibat (HP Chromebox G3)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_PALKIA
 	bool "->  Palkia"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select DRIVERS_I2C_RT1011
 
 config BOARD_GOOGLE_PUFF
 	bool "->  Puff"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select BOARD_ROMSIZE_KB_32768
-	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_SCOUT
 	bool "->  Scout"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
 
 config BOARD_GOOGLE_WYVERN
 	bool "->  Wyvern (CTL Chromebox CBx2)"
-	select BOARD_GOOGLE_BASEBOARD_PUFF
-	select INTEL_GMA_HAVE_VBT