4 files changed, 9 insertions, 3 deletions
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig
index 5b33ed6abc..60a07eb3d6 100644
--- a/src/mainboard/google/drallion/Kconfig
+++ b/src/mainboard/google/drallion/Kconfig
@@ -31,6 +31,9 @@ if BOARD_GOOGLE_BASEBOARD_DRALLION
 config IGNORE_IASL_MISSING_DEPENDENCY
 	def_bool y
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y
+
 config CHROMEOS
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 00376be4da..2ddc403681 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -153,6 +153,9 @@ if BOARD_GOOGLE_HATCH_COMMON
 config IGNORE_IASL_MISSING_DEPENDENCY
 	def_bool y
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y if BOARD_GOOGLE_BASEBOARD_HATCH
+
 config CHROMEOS
 	select CHROMEOS_DRAM_PART_NUMBER_IN_CBI if !ROMSTAGE_SPD_SMBUS
 	select EC_GOOGLE_CHROMEEC_SWITCHES
diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig
index 81f107261a..9381ac900d 100644
--- a/src/mainboard/google/sarien/Kconfig
+++ b/src/mainboard/google/sarien/Kconfig
@@ -39,6 +39,9 @@ if BOARD_GOOGLE_BASEBOARD_SARIEN
 config IGNORE_IASL_MISSING_DEPENDENCY
 	def_bool y
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y
+
 config CHROMEOS
 	select GBB_FLAG_FORCE_DEV_SWITCH_ON
 	select GBB_FLAG_FORCE_DEV_BOOT_USB
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 94f0b4835d..ea50970e0c 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -111,9 +111,6 @@ config CPU_SPECIFIC_OPTIONS
 	select UDELAY_TSC
 	select UDK_2017_BINDING
 
-config DISABLE_HECI1_AT_PRE_BOOT
-	default y if MAINBOARD_HAS_CHROMEOS
-
 config MAX_CPUS
 	int
 	default 12