diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index b284ffecdb..11137bde6e 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -141,13 +141,13 @@ config VARIANT_DIR
 config VBOOT
 	select HAS_RECOVERY_MRC_CACHE
 	select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
+	select VBOOT_EARLY_EC_SYNC
 
 endif # BOARD_GOOGLE_BASEBOARD_HATCH
 
 if BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
 
 config VBOOT
-	select VBOOT_EARLY_EC_SYNC
 	select VBOOT_LID_SWITCH
 
 endif # BOARD_GOOGLE_BASEBOARD_HATCH_LAPTOP
diff --git a/src/mainboard/google/hatch/Kconfig.name b/src/mainboard/google/hatch/Kconfig.name
index 0713d13917..de9bcb53b1 100644
--- a/src/mainboard/google/hatch/Kconfig.name
+++ b/src/mainboard/google/hatch/Kconfig.name
@@ -88,7 +88,6 @@ config BOARD_GOOGLE_PUFF
 	select BOARD_ROMSIZE_KB_32768
 	select ROMSTAGE_SPD_SMBUS
 	select SPD_READ_BY_WORD
-	select VBOOT_EC_EFS
 
 config BOARD_GOOGLE_HELIOS_DISKSWAP
 	bool "->  Helios_Diskswap"