From 5d98dabb4e10cb93cae9b43f47dc3c4fe1fefd5f Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Fri, 19 Feb 2021 22:01:55 +0100
Subject: soc/intel: Drop `bootblock_cpu_init()` function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/soc/intel/elkhartlake/bootblock/bootblock.c |  3 ++-
 src/soc/intel/elkhartlake/bootblock/cpu.c       | 15 ---------------
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 src/soc/intel/elkhartlake/bootblock/cpu.c

(limited to 'src/soc/intel/elkhartlake/bootblock')

diff --git a/src/soc/intel/elkhartlake/bootblock/bootblock.c b/src/soc/intel/elkhartlake/bootblock/bootblock.c
index 96e6268f74..b8086a42ab 100644
--- a/src/soc/intel/elkhartlake/bootblock/bootblock.c
+++ b/src/soc/intel/elkhartlake/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/elkhartlake/bootblock/cpu.c b/src/soc/intel/elkhartlake/bootblock/cpu.c
deleted file mode 100644
index bbce44cd60..0000000000
--- a/src/soc/intel/elkhartlake/bootblock/cpu.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <intelblocks/fast_spi.h>
-#include <soc/bootblock.h>
-
-void bootblock_cpu_init(void)
-{
-	/*
-	 * Elkhartlake 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
-	 * caching on memory-mapped spi boot media.
-	 */
-	fast_spi_cache_bios_region();
-}
-- 
cgit v1.2.3