diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 11137bde6e..6168e13140 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -26,6 +26,7 @@ config BOARD_GOOGLE_BASEBOARD_HATCH
 	select RT8168_SET_LED_MODE
 
 config BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select SYSTEM_TYPE_LAPTOP
 	def_bool n
 
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index de9bcb53b1..6465854104 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -2,13 +2,11 @@ comment "Hatch"
 
 config BOARD_GOOGLE_AKEMI
 	bool "-> Akemi"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 
 config BOARD_GOOGLE_DRATINI
 	bool "-> Dratini"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 
@@ -22,13 +20,11 @@ config BOARD_GOOGLE_DUFFY
 
 config BOARD_GOOGLE_HATCH
 	bool "->  Hatch"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_32768
 
 config BOARD_GOOGLE_JINLON
 	bool "-> Jinlon"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_GFX_GENERIC
@@ -43,20 +39,17 @@ config BOARD_GOOGLE_KAISA
 
 config BOARD_GOOGLE_KOHAKU
 	bool "->  Kohaku"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 
 config BOARD_GOOGLE_KINDRED
 	bool "->  Kindred"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 	select SOC_INTEL_COMMON_MMC_OVERRIDE
 
 config BOARD_GOOGLE_HELIOS
 	bool "->  Helios"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 	select CHROMEOS_DSM_CALIB
@@ -64,13 +57,11 @@ config BOARD_GOOGLE_HELIOS
 
 config BOARD_GOOGLE_MUSHU
 	bool "-> Mushu"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 
 config BOARD_GOOGLE_PALKIA
 	bool "->  Palkia"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 	select CHROMEOS_DSM_CALIB
@@ -78,7 +69,6 @@ config BOARD_GOOGLE_PALKIA
 
 config BOARD_GOOGLE_NIGHTFURY
 	bool "-> Nightfury"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 
@@ -91,7 +81,6 @@ config BOARD_GOOGLE_PUFF
 
 config BOARD_GOOGLE_HELIOS_DISKSWAP
 	bool "->  Helios_Diskswap"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 	select CHROMEOS_DSM_CALIB
@@ -99,12 +88,10 @@ config BOARD_GOOGLE_HELIOS_DISKSWAP
 
 config BOARD_GOOGLE_STRYKE
 	bool "-> Stryke"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384
 
 config BOARD_GOOGLE_SUSHI
 	bool "-> Sushi"
-	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 	select BOARD_ROMSIZE_KB_16384