UPSTREAM: mb/google/hatch: Set hatch to use SOC_INTEL_COMETLAKE

Move these configs to Kconfig.name as well.

BUG=b:127310803
BRANCH=None
TEST=emerge-hatch coreboot chromeos-bootimage
CQ-DEPEND=CL:1528209, CL:1530306

Change-Id: I793363740fa0730a1e9e1aa7a9fa82d2789334b4
Signed-off-by: Shelley Chen <shchen@google.com>
Original-Commit-Id: d0e218384f2c9127f701a41b0b8add08528c1450
Original-Change-Id: I793363740fa0730a1e9e1aa7a9fa82d2789334b4
Original-Signed-off-by: Shelley Chen <shchen@google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/31852
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/1530305
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Shelley Chen <shchen@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index e2bf39c..19c7184 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -19,7 +19,6 @@
 	select MAINBOARD_HAS_SPI_TPM_CR50
 	select MAINBOARD_HAS_TPM2
 	select MB_HAS_ACTIVE_HIGH_SD_PWR_ENABLE
-	select SOC_INTEL_WHISKEYLAKE
 	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 fa743cd..e98bcae 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -3,7 +3,9 @@
 config BOARD_GOOGLE_HATCH
 	bool "->  Hatch"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select SOC_INTEL_COMETLAKE
 
 config BOARD_GOOGLE_HATCH_WHL
 	bool "->  Hatch_whl"
 	select BOARD_GOOGLE_BASEBOARD_HATCH
+	select SOC_INTEL_WHISKEYLAKE