summaryrefslogtreecommitdiff
path: root/src/soc/intel/cannonlake/bootblock
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-02-19 22:01:55 +0100
committerAngel Pons <th3fanbus@gmail.com>2021-03-01 19:43:04 +0000
commit5d98dabb4e10cb93cae9b43f47dc3c4fe1fefd5f (patch)
tree195662824e02eed68659fd6a6b54087ac8439cbb /src/soc/intel/cannonlake/bootblock
parent43026ba81966a9f065435a68a6ca8bd69005fe19 (diff)
soc/intel: Drop `bootblock_cpu_init()` function
Just call `fast_spi_cache_bios_region()` directly instead. Change-Id: I99f6ed4cf1a5c49b078cfd05e357c2d4c26ade45 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50952 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/cannonlake/bootblock')
-rw-r--r--src/soc/intel/cannonlake/bootblock/bootblock.c3
-rw-r--r--src/soc/intel/cannonlake/bootblock/cpu.c10
2 files changed, 2 insertions, 11 deletions
diff --git a/src/soc/intel/cannonlake/bootblock/bootblock.c b/src/soc/intel/cannonlake/bootblock/bootblock.c
index 255bac86d9..dfa0bd00b5 100644
--- a/src/soc/intel/cannonlake/bootblock/bootblock.c
+++ b/src/soc/intel/cannonlake/bootblock/bootblock.c
@@ -2,6 +2,7 @@
#include <bootblock_common.h>
#include <cpu/x86/mtrr.h>
+#include <intelblocks/fast_spi.h>
#include <intelblocks/gspi.h>
#include <intelblocks/systemagent.h>
#include <intelblocks/tco.h>
@@ -52,7 +53,7 @@ void bootblock_soc_early_init(void)
{
bootblock_systemagent_early_init();
bootblock_pch_early_init();
- bootblock_cpu_init();
+ fast_spi_cache_bios_region();
pch_early_iorange_init();
if (CONFIG(INTEL_LPSS_UART_FOR_CONSOLE))
uart_bootblock_init();
diff --git a/src/soc/intel/cannonlake/bootblock/cpu.c b/src/soc/intel/cannonlake/bootblock/cpu.c
deleted file mode 100644
index 30c1a412ea..0000000000
--- a/src/soc/intel/cannonlake/bootblock/cpu.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <intelblocks/fast_spi.h>
-#include <soc/bootblock.h>
-
-void bootblock_cpu_init(void)
-{
- /* Temporarily cache the memory-mapped boot media. */
- fast_spi_cache_bios_region();
-}