diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-09 22:53:52 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-02-09 07:53:23 +0000 |
| commit | cc93c6e47480de06ce87705a93bc46d806cabbb3 (patch) | |
| tree | 4fa56de3a3e885246d3892c6897d954bf2e3ffb3 /src/soc/intel/apollolake | |
| parent | 4949a3dd626560aa504cee18d936d0d7602becfa (diff) | |
soc/amd,intel: Drop s3_resume parameter on FSP-S functions
ACPI S3 is a global state and it is no longer needed to
pass it as a parameter.
Change-Id: Id0639a47ea65c210b9a79e6ca89cee819e7769b1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50360
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/soc/intel/apollolake')
| -rw-r--r-- | src/soc/intel/apollolake/chip.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/cpu.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 39d9be5a84..7172231c07 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -23,7 +23,6 @@ #include <intelblocks/gpio.h> #include <intelblocks/itss.h> #include <intelblocks/pmclib.h> -#include <romstage_handoff.h> #include <soc/cpu.h> #include <soc/heci.h> #include <soc/intel/common/vbt.h> @@ -302,7 +301,7 @@ static void soc_init(void *data) */ gpi_clear_int_cfg(); - fsp_silicon_init(romstage_handoff_is_resume()); + fsp_silicon_init(); /* Restore GPIO IRQ polarities back to previous settings. */ itss_restore_irq_polarities(GPIO_IRQ_START, GPIO_IRQ_END); diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c index 0ae170b44d..a071337f9f 100644 --- a/src/soc/intel/apollolake/cpu.c +++ b/src/soc/intel/apollolake/cpu.c @@ -24,7 +24,6 @@ #include <intelblocks/msr.h> #include <intelblocks/sgx.h> #include <reg_script.h> -#include <romstage_handoff.h> #include <soc/cpu.h> #include <soc/iomap.h> #include <soc/pci_devs.h> @@ -140,7 +139,7 @@ static struct smm_relocation_attrs relo_attrs; static void pre_mp_init(void) { if (CONFIG(SOC_INTEL_COMMON_BLOCK_CPU_MPINIT)) { - fsps_load(romstage_handoff_is_resume()); + fsps_load(); return; } x86_setup_mtrrs_with_detect(); |