diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index c4c9146803..d4cf83dfe9 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -20,6 +20,7 @@ config BOARD_GOOGLE_BASEBOARD_HATCH
 	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
+	select SOC_INTEL_COMETLAKE
 	select SYSTEM_TYPE_LAPTOP
 
 if BOARD_GOOGLE_BASEBOARD_HATCH
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 01b6eadbf1..fbc4c15894 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -4,35 +4,29 @@ config BOARD_GOOGLE_AKEMI
 	bool "-> Akemi"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_16384
-	select SOC_INTEL_COMETLAKE
 
 config BOARD_GOOGLE_DRATINI
 	bool "-> Dratini"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_16384
-	select SOC_INTEL_COMETLAKE
 
 config BOARD_GOOGLE_HATCH
 	bool "->  Hatch"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_32768
-	select SOC_INTEL_COMETLAKE
 
 config BOARD_GOOGLE_KOHAKU
 	bool "->  Kohaku"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_16384
-	select SOC_INTEL_COMETLAKE
 
 config BOARD_GOOGLE_KINDRED
 	bool "->  Kindred"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_16384
-	select SOC_INTEL_COMETLAKE
 	select SOC_INTEL_COMMON_MMC_OVERRIDE
 
 config BOARD_GOOGLE_HELIOS
 	bool "->  Helios"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
 	select BOARD_ROMSIZE_KB_16384
-	select SOC_INTEL_COMETLAKE