Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16226
-gerrit
commit 6b9bf2e89cd3a7c9caa18c29d35b5f9b2a83001d Author: Aaron Durbin adurbin@chromium.org Date: Mon Aug 15 14:13:05 2016 -0500
Revert "Kconfig: separate memory mapped boot device from SPI"
This reverts commit a83bbf58541cf41ea7a97dedbc8c02dffa59e86d. This was submitted out of order.
Change-Id: Ic5a28faf94c1f1901a72e46343722eb4224c5086 Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/Kconfig | 7 ------- src/drivers/elog/elog.c | 4 ++-- src/drivers/spi/Kconfig | 7 +++++++ src/lib/cbfs.c | 2 +- src/soc/intel/apollolake/romstage.c | 3 +-- 5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 44848d8..3af2769 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -471,13 +471,6 @@ endmenu
source "src/acpi/Kconfig"
-config BOOT_DEVICE_MEMORY_MAPPED - bool - default y if ARCH_X86 && BOOT_DEVICE_SPI_FLASH - default n - help - Inform system if SPI is memory-mapped or not. - config RTC bool default n diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index f046a34..55b8974 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -586,8 +586,8 @@ static int elog_shrink(void) */ static inline u8 *elog_flash_offset_to_address(void) { - /* Only support memory-mapped devices. */ - if (!IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)) + /* Only support memory-mapped SPI devices. */ + if (!IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED)) return NULL;
if (!elog_spi) diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig index 7776d5b..194e61f 100644 --- a/src/drivers/spi/Kconfig +++ b/src/drivers/spi/Kconfig @@ -37,6 +37,13 @@ config SPI_ATOMIC_SEQUENCING in the SPI controller. Hardware manages the transaction instead of software. This is common on x86 platforms.
+config SPI_FLASH_MEMORY_MAPPED + bool + default y if ARCH_X86 + default n if !ARCH_X86 + help + Inform system if SPI is memory-mapped or not. + config SPI_FLASH_SMM bool "SPI flash driver support in SMM" default n diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 7318c87..7a0f187 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -193,7 +193,7 @@ int cbfs_prog_stage_load(struct prog *pstage) /* Hacky way to not load programs over read only media. The stages * that would hit this path initialize themselves. */ if (ENV_VERSTAGE && !IS_ENABLED(CONFIG_NO_XIP_EARLY_STAGES) && - IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED)) { + IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED)) { void *mapping = rdev_mmap(fh, foffset, fsize); rdev_munmap(fh, mapping); if (mapping == load) diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index 067d654..8f17fdd 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -160,8 +160,7 @@ void platform_fsp_memory_init_params_cb(struct FSPM_UPD *mupd) * state machine transition to next boot state, so that it can function * as designed. */ - mupd->FspmConfig.SkipCseRbp = - IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED); + mupd->FspmConfig.SkipCseRbp = IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED); }
__attribute__ ((weak))