4 files changed, 2 insertions, 21 deletions

diff --git a/src/soc/intel/jasperlake/Makefile.inc b/src/soc/intel/jasperlake/Makefile.inc
index 677b5f3c52..ccff1e077f 100644
--- a/src/soc/intel/jasperlake/Makefile.inc
+++ b/src/soc/intel/jasperlake/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/jasperlake/bootblock/bootblock.c b/src/soc/intel/jasperlake/bootblock/bootblock.c
index 96e6268f74..b8086a42ab 100644
--- a/src/soc/intel/jasperlake/bootblock/bootblock.c
+++ b/src/soc/intel/jasperlake/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/jasperlake/bootblock/cpu.c b/src/soc/intel/jasperlake/bootblock/cpu.c
deleted file mode 100644
index 292733acee..0000000000
--- a/src/soc/intel/jasperlake/bootblock/cpu.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <intelblocks/fast_spi.h>
-#include <soc/bootblock.h>
-
-void bootblock_cpu_init(void)
-{
-	/*
-	 * Jasperlake 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/jasperlake/include/soc/bootblock.h b/src/soc/intel/jasperlake/include/soc/bootblock.h
index 413ae4f83b..678a2c4678 100644
--- a/src/soc/intel/jasperlake/include/soc/bootblock.h
+++ b/src/soc/intel/jasperlake/include/soc/bootblock.h
@@ -4,7 +4,6 @@
 #define _SOC_JASPERLAKE_BOOTBLOCK_H_
 
 /* Bootblock pre console init programming */
-void bootblock_cpu_init(void);
 void bootblock_pch_early_init(void);
 
 /* Bootblock post console init programming */