diff options
Diffstat (limited to 'src/soc/intel/icelake')
| -rw-r--r-- | src/soc/intel/icelake/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/intel/icelake/bootblock/bootblock.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/icelake/bootblock/cpu.c | 18 | ||||
| -rw-r--r-- | src/soc/intel/icelake/include/soc/bootblock.h | 1 |
4 files changed, 2 insertions, 21 deletions
diff --git a/src/soc/intel/icelake/Makefile.inc b/src/soc/intel/icelake/Makefile.inc index 05f4846963..05e11f2e32 100644 --- a/src/soc/intel/icelake/Makefile.inc +++ b/src/soc/intel/icelake/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/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c index df1fb56234..ef5ada6239 100644 --- a/src/soc/intel/icelake/bootblock/bootblock.c +++ b/src/soc/intel/icelake/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/icelake/bootblock/cpu.c b/src/soc/intel/icelake/bootblock/cpu.c deleted file mode 100644 index bf5fc1be65..0000000000 --- a/src/soc/intel/icelake/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) -{ - /* - * Icelake 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/icelake/include/soc/bootblock.h b/src/soc/intel/icelake/include/soc/bootblock.h index f22b2665ec..cdc350f74a 100644 --- a/src/soc/intel/icelake/include/soc/bootblock.h +++ b/src/soc/intel/icelake/include/soc/bootblock.h @@ -4,7 +4,6 @@ #define _SOC_ICELAKE_BOOTBLOCK_H_ /* Bootblock pre console init programming */ -void bootblock_cpu_init(void); void bootblock_pch_early_init(void); /* Bootblock post console init programming */ |