summaryrefslogtreecommitdiff
path: root/src/soc/intel/tigerlake
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/tigerlake
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/tigerlake')
-rw-r--r--src/soc/intel/tigerlake/Makefile.inc1
-rw-r--r--src/soc/intel/tigerlake/bootblock/bootblock.c3
-rw-r--r--src/soc/intel/tigerlake/bootblock/cpu.c24
-rw-r--r--src/soc/intel/tigerlake/include/soc/bootblock.h1
4 files changed, 2 insertions, 27 deletions
diff --git a/src/soc/intel/tigerlake/Makefile.inc b/src/soc/intel/tigerlake/Makefile.inc
index f20640617e..baa9261f22 100644
--- a/src/soc/intel/tigerlake/Makefile.inc
+++ b/src/soc/intel/tigerlake/Makefile.inc
@@ -16,7 +16,6 @@ all-y += spi.c
all-y += uart.c
bootblock-y += bootblock/bootblock.c
-bootblock-y += bootblock/cpu.c
bootblock-y += bootblock/pch.c
bootblock-y += bootblock/report_platform.c
bootblock-y += espi.c
diff --git a/src/soc/intel/tigerlake/bootblock/bootblock.c b/src/soc/intel/tigerlake/bootblock/bootblock.c
index 96e6268f74..b8086a42ab 100644
--- a/src/soc/intel/tigerlake/bootblock/bootblock.c
+++ b/src/soc/intel/tigerlake/bootblock/bootblock.c
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <bootblock_common.h>
+#include <intelblocks/fast_spi.h>
#include <intelblocks/systemagent.h>
#include <intelblocks/tco.h>
#include <intelblocks/uart.h>
@@ -16,7 +17,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/tigerlake/bootblock/cpu.c b/src/soc/intel/tigerlake/bootblock/cpu.c
deleted file mode 100644
index ed9381c2f3..0000000000
--- a/src/soc/intel/tigerlake/bootblock/cpu.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-/*
- * This file is created based on Intel Tiger Lake Processor PCH Datasheet
- * Document number: 575857
- * Chapter number: 6
- */
-
-#include <intelblocks/fast_spi.h>
-#include <soc/bootblock.h>
-
-void bootblock_cpu_init(void)
-{
- /*
- * Tigerlake platform doesn't support booting from any other media
- * (like eMMC on APL/GLK platform) than only booting from SPI device
- * and on IA platform SPI is memory mapped hence enabling temporarily
- * cacheing on memory-mapped spi boot media.
- *
- * This assumption will not hold good for APL/GLK platform where boot
- * from eMMC is also possible options.
- */
- fast_spi_cache_bios_region();
-}
diff --git a/src/soc/intel/tigerlake/include/soc/bootblock.h b/src/soc/intel/tigerlake/include/soc/bootblock.h
index 87be0e0a70..71a16a5fa2 100644
--- a/src/soc/intel/tigerlake/include/soc/bootblock.h
+++ b/src/soc/intel/tigerlake/include/soc/bootblock.h
@@ -4,7 +4,6 @@
#define _SOC_TIGERLAKE_BOOTBLOCK_H_
/* Bootblock pre console init programming */
-void bootblock_cpu_init(void);
void bootblock_pch_early_init(void);
/* Bootblock post console init programming */