summaryrefslogtreecommitdiff
path: root/src/soc/intel/cannonlake
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-01-09 22:53:52 +0200
committerPatrick Georgi <pgeorgi@google.com>2021-02-09 07:53:23 +0000
commitcc93c6e47480de06ce87705a93bc46d806cabbb3 (patch)
tree4fa56de3a3e885246d3892c6897d954bf2e3ffb3 /src/soc/intel/cannonlake
parent4949a3dd626560aa504cee18d936d0d7602becfa (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/cannonlake')
-rw-r--r--src/soc/intel/cannonlake/chip.c3
-rw-r--r--src/soc/intel/cannonlake/cpu.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/soc/intel/cannonlake/chip.c b/src/soc/intel/cannonlake/chip.c
index 0958aace02..4f467a1ab7 100644
--- a/src/soc/intel/cannonlake/chip.c
+++ b/src/soc/intel/cannonlake/chip.c
@@ -10,7 +10,6 @@
#include <intelblocks/itss.h>
#include <intelblocks/pcie_rp.h>
#include <intelblocks/xdci.h>
-#include <romstage_handoff.h>
#include <soc/intel/common/vbt.h>
#include <soc/gpio.h>
#include <soc/pci_devs.h>
@@ -171,7 +170,7 @@ void cnl_configure_pads(const struct pad_config *cfg, size_t num_pads)
void soc_init_pre_device(void *chip_info)
{
/* Perform silicon specific init. */
- fsp_silicon_init(romstage_handoff_is_resume());
+ fsp_silicon_init();
/* Display FIRMWARE_VERSION_INFO_HOB */
fsp_display_fvi_version_hob();
diff --git a/src/soc/intel/cannonlake/cpu.c b/src/soc/intel/cannonlake/cpu.c
index f4b72abe75..6a4f77371b 100644
--- a/src/soc/intel/cannonlake/cpu.c
+++ b/src/soc/intel/cannonlake/cpu.c
@@ -10,7 +10,6 @@
#include <cpu/intel/turbo.h>
#include <intelblocks/cpulib.h>
#include <intelblocks/mp_init.h>
-#include <romstage_handoff.h>
#include <soc/cpu.h>
#include <soc/msr.h>
#include <soc/pci_devs.h>
@@ -23,7 +22,7 @@
static void soc_fsp_load(void)
{
- fsps_load(romstage_handoff_is_resume());
+ fsps_load();
}
static void configure_misc(void)