diff options
| author | Matt DeVillier <matt.devillier@puri.sm> | 2022-01-25 12:41:49 -0600 |
|---|---|---|
| committer | Subrata Banik <subratabanik@google.com> | 2022-01-27 10:46:53 +0000 |
| commit | 96eb676b5ebaa482e0618a4dcf764e0d1d0d3af1 (patch) | |
| tree | dfb9aca90fc7c2d062ab9fe14c1478a5ec2addc7 /src/soc/intel | |
| parent | 2cd3384b1875d1d7230e5c383cafdd6bb11d7815 (diff) | |
soc/intel/skylake: move heci_init() from bootblock to romstage
Aligns with all other soc/intel/common platforms calling heci_init().
Test: build/boot Purism Librem 13v2
Change-Id: I43029426c5683077c111b3382cf4c8773b3e5b20
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61378
Reviewed-by: Subrata Banik <subratabanik@google.com>
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/skylake/bootblock/pch.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/romstage/romstage.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c index 1685e43e0e..ec60cabbea 100644 --- a/src/soc/intel/skylake/bootblock/pch.c +++ b/src/soc/intel/skylake/bootblock/pch.c @@ -2,7 +2,6 @@ #include <device/pci_ops.h> #include <device/device.h> #include <device/pci_def.h> -#include <intelblocks/cse.h> #include <intelblocks/dmi.h> #include <intelblocks/fast_spi.h> #include <intelblocks/gspi.h> @@ -141,8 +140,5 @@ void bootblock_pch_init(void) enable_rtc_upper_bank(); - /* initialize Heci interface */ - heci_init(HECI1_BASE_ADDRESS); - gspi_early_bar_init(); } diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c index 30f65eae01..7e891b19f8 100644 --- a/src/soc/intel/skylake/romstage/romstage.c +++ b/src/soc/intel/skylake/romstage/romstage.c @@ -4,6 +4,7 @@ #include <cbmem.h> #include <console/console.h> #include <fsp/util.h> +#include <intelblocks/cse.h> #include <intelblocks/pmclib.h> #include <intelblocks/smbus.h> #include <memory_info.h> @@ -127,6 +128,8 @@ void mainboard_romstage_entry(void) systemagent_early_init(); /* Program SMBus base address and enable it */ smbus_common_init(); + /* initialize Heci interface */ + heci_init(HECI1_BASE_ADDRESS); ps = pmc_get_power_state(); s3wake = pmc_fill_power_state(ps) == ACPI_S3; fsp_memory_init(s3wake); |