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/apollolake/Kconfig | 2 +- src/soc/intel/apollolake/spi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc/intel/apollolake') diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index cba2eab060..d1d660bc78 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -52,7 +52,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE select SOC_INTEL_COMMON_LPSS_I2C select SOC_INTEL_COMMON_SMI - select SOC_INTEL_COMMON_SPI_PROTECT + select SOC_INTEL_COMMON_SPI_FLASH_PROTECT select UDELAY_TSC select TSC_CONSTANT_RATE select TSC_MONOTONIC_TIMER diff --git a/src/soc/intel/apollolake/spi.c b/src/soc/intel/apollolake/spi.c index 4da292ac85..eab3a12eac 100644 --- a/src/soc/intel/apollolake/spi.c +++ b/src/soc/intel/apollolake/spi.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -420,7 +420,7 @@ int spi_read_status(uint8_t *status) return 0; } -int spi_get_fpr_info(struct fpr_info *info) +int spi_flash_get_fpr_info(struct fpr_info *info) { BOILERPLATE_CREATE_CTX(ctx); -- cgit v1.2.3