From d0c00052d32ed2ea461811632197845120ca8a08 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 21 Nov 2016 09:19:53 -0800 Subject: soc/intel: Use correct terminology for SPI flash operations FPR is an attribute of the SPI flash component and not of the SPI bus itself. Rename functions, file names and Kconfig option to make sure this is conveyed correctly. BUG=None BRANCH=None TEST=Compiles successfully. Change-Id: I9f06f1a8ee28b8c56db64ddd6a19dd9179c54f50 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/17560 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/soc/intel/skylake/Kconfig | 2 +- src/soc/intel/skylake/flash_controller.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc/intel/skylake') diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 04dbf0e1fb..988547c8a8 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -44,7 +44,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_LPSS_I2C select SOC_INTEL_COMMON_NHLT select SOC_INTEL_COMMON_RESET - select SOC_INTEL_COMMON_SPI_PROTECT + select SOC_INTEL_COMMON_SPI_FLASH_PROTECT select SMM_TSEG select SMP select SSE2 diff --git a/src/soc/intel/skylake/flash_controller.c b/src/soc/intel/skylake/flash_controller.c index eacd414046..cc6c20a4be 100644 --- a/src/soc/intel/skylake/flash_controller.c +++ b/src/soc/intel/skylake/flash_controller.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -384,7 +384,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs) return slave; } -int spi_get_fpr_info(struct fpr_info *info) +int spi_flash_get_fpr_info(struct fpr_info *info) { pch_spi_regs *spi_bar = get_spi_bar(); -- cgit v1.2.3