summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorTim Wawrzynczak <twawrzynczak@chromium.org>2022-09-20 18:07:56 +0000
committerMartin L Roth <gaumless@gmail.com>2022-09-20 22:00:53 +0000
commitb525ea726b257ca6b4e03f4f4427f92046722e26 (patch)
tree6d59e67f6da0d4865e6b2d47c21808c35c2d644b /src/soc/intel
parent19491c526d1bbb3f62d2d33a9f65c564d6b3ca28 (diff)
Revert "soc/intel/apollolake: Configure FSP UPDs to allow coreboot to lockdown"
This reverts commit 7ef5376123d4d0ebb811795fcee1de7066f65a0f. Reason for revert: It was merged before its dependencies so now master is broken. Change-Id: Ia270efaed4f5c9d0c7b9761ae22dec55f57f74cf Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/67285 Reviewed-by: Felix Singer <felixsinger@posteo.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/apollolake/chip.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 5bee9bfdbb..da2d00adb7 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -16,7 +16,6 @@
#include <intelblocks/p2sb.h>
#include <intelblocks/power_limit.h>
#include <intelblocks/xdci.h>
-#include <intelpch/lockdown.h>
#include <fsp/api.h>
#include <fsp/util.h>
#include <intelblocks/cpulib.h>
@@ -698,13 +697,11 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *silupd)
silconfig->SkipMpInit = !CONFIG(USE_INTEL_FSP_MP_INIT);
- /* coreboot handles the lockdown */
- silconfig->LockDownGlobalSmi = 0;
- silconfig->BiosLock = 0;
- silconfig->BiosInterface = 0;
- silconfig->WriteProtectionEnable[0] = 0;
- silconfig->SpiEiss = 0;
- silconfig->RtcLock = 0;
+ /* Disable setting of EISS bit in FSP. */
+ silconfig->SpiEiss = 0;
+
+ /* Disable FSP from locking access to the RTC NVRAM */
+ silconfig->RtcLock = 0;
/* Enable Audio clk gate and power gate */
silconfig->HDAudioClkGate = cfg->hdaudio_clk_gate_enable;