diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig
index d9b73bb100..3e2b8c171b 100644
--- a/src/mainboard/google/fizz/Kconfig
+++ b/src/mainboard/google/fizz/Kconfig
@@ -23,9 +23,6 @@ config BOARD_GOOGLE_BASEBOARD_FIZZ
 	select RT8168_SUPPORT_LEGACY_VPD_MAC
 	select RT8168_SET_LED_MODE
 
-config DISABLE_HECI1_AT_PRE_BOOT
-	default y
-
 config BOARD_GOOGLE_FIZZ
 	select BOARD_GOOGLE_BASEBOARD_FIZZ
 
@@ -40,6 +37,9 @@ config BOARD_GOOGLE_ENDEAVOUR
 
 if BOARD_GOOGLE_BASEBOARD_FIZZ
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y
+
 config IGNORE_IASL_MISSING_DEPENDENCY
 	def_bool y
 
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index f87f8fd7db..68e4f7199d 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -21,9 +21,6 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
 	select SOC_INTEL_SKYLAKE
 	select SYSTEM_TYPE_LAPTOP
 
-config DISABLE_HECI1_AT_PRE_BOOT
-	default y
-
 config BOARD_GOOGLE_ASUKA
 	select BOARD_GOOGLE_BASEBOARD_GLADOS
 	select DRIVERS_GENERIC_MAX98357A
@@ -78,6 +75,9 @@ config BOARD_GOOGLE_SENTRY
 
 if BOARD_GOOGLE_BASEBOARD_GLADOS
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y
+
 config IGNORE_IASL_MISSING_DEPENDENCY
 	def_bool y
 
diff --git a/src/mainboard/kontron/bsl6/Kconfig b/src/mainboard/kontron/bsl6/Kconfig
index 78e81c4573..782f560744 100644
--- a/src/mainboard/kontron/bsl6/Kconfig
+++ b/src/mainboard/kontron/bsl6/Kconfig
@@ -15,9 +15,6 @@ config BOARD_KONTRON_BSL6_COMMON
 	select MAINBOARD_HAS_LIBGFXINIT
 	select DRIVERS_I2C_NCT7802Y
 
-config DISABLE_HECI1_AT_PRE_BOOT
-	default y
-
 config BOARD_KONTRON_BSL6
 	select BOARD_KONTRON_BSL6_COMMON
 	select HAVE_ACPI_RESUME
@@ -29,6 +26,9 @@ config BOARD_SIEMENS_BOXER26
 
 if BOARD_KONTRON_BSL6_COMMON
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y
+
 config MAINBOARD_DIR
 	default "kontron/bsl6"