summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSubrata Banik <subratabanik@google.com>2022-01-06 09:34:43 +0000
committerSubrata Banik <subratabanik@google.com>2022-01-11 19:18:02 +0000
commit206b0bc212f7072e879596729764eba566356c28 (patch)
tree817f60e38dacc61e19425ebc7de3c56be8e7ab61 /src
parent5e7f90bb4c24ad9c500de153df3b2304f569f6e9 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/soc/intel/apollolake/Kconfig3
-rw-r--r--src/soc/intel/apollolake/cse.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 45e21dd83a..d3f7332047 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/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
diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c
index 24fb41749d..29d0a5e3d8 100644
--- a/src/soc/intel/apollolake/cse.c
+++ b/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);