summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2016-08-11 14:04:10 -0500
committerMartin Roth <martinroth@google.com>2016-08-19 03:04:54 +0200
commit16c173fdf5d6060ecdd63ca4593fb76b2167ab9b (patch)
tree77e1d8fac04949cbd9fb891228b2baa0ea592a13 /src/drivers
parentd3d77beffa1e7c8d28deabeda0709e0a0beacce2 (diff)
downloadcoreboot-16c173fdf5d6060ecdd63ca4593fb76b2167ab9b.tar.xz
Kconfig: separate memory mapped boot device from SPI
Make the indication of the boot device being memory mapped separate from SPI. However, retain the same defaults that previously existed. BUG=chrome-os-partner:56151 Change-Id: I06f138078c47a1e4b4b3edbdbf662f171e11c9d4 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/16228 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/elog/elog.c4
-rw-r--r--src/drivers/spi/Kconfig7
2 files changed, 2 insertions, 9 deletions
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index 0b7dee3b8b..3d8c85c86a 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 SPI devices. */
- if (!IS_ENABLED(CONFIG_SPI_FLASH_MEMORY_MAPPED))
+ /* Only support memory-mapped devices. */
+ if (!IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED))
return NULL;
if (!elog_spi)
diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig
index ee48d676de..b0187fda0d 100644
--- a/src/drivers/spi/Kconfig
+++ b/src/drivers/spi/Kconfig
@@ -45,13 +45,6 @@ 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