soc/intel/apl: Use Kconfig to disable HECI1

This patch makes DISABLE_HECI1_AT_PRE_BOOT=y default for Apollo Lake
and ensures disable_heci1() is guarded against this config.

Signed-off-by: Subrata Banik <subratabanik@google.com>
Change-Id: I7ac0cad97fcd42b2c6386693319d863352356864
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60835
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

src/soc/intel/apollolake/Kconfig

@@ -116,6 +116,9 @@ config CPU_SPECIFIC_OPTIONS
 	# provide a custom media driver that facilitates mapping
 	select X86_CUSTOM_BOOTMEDIA
 
+config DISABLE_HECI1_AT_PRE_BOOT
+	default y
+
 config MAX_CPUS
 	int
 	default 4

src/soc/intel/apollolake/cse.c

@@ -206,7 +206,8 @@ void heci_cse_lockdown(void)
 	 * It is safe to disable HECI1 now since we won't be talking to the ME
 	 * anymore.
 	 */
-	disable_heci1();
+	if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT))
+		disable_heci1();
 }
 
 BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, fpf_blown, NULL);