From 08e842c0d10c69b8fc07f6b00ea4dbeb85ac6e58 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Thu, 11 Aug 2016 14:40:09 -0500 Subject: Kconfig: rename BOOT_MEDIA_SPI_BUS to BOOT_DEVICE_SPI_FLASH_BUS Provide a default value of 0 in drivers/spi as there weren't default values aside from specific mainboards and arch/x86. Remove any default 0 values while noting to keep the option's default to 0. BUG=chrome-os-partner:56151 Change-Id: If9ef585e011a46b5cd152a03e41d545b36355a61 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/16192 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Martin Roth --- src/drivers/elog/elog.c | 2 +- src/drivers/spi/Kconfig | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/drivers') diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index 55b8974304..0b7dee3b8b 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -751,7 +751,7 @@ int elog_init(void) elog_debug("elog_init()\n"); /* Probe SPI chip. SPI controller must already be initialized. */ - elog_spi = spi_flash_probe(CONFIG_BOOT_MEDIA_SPI_BUS, 0); + elog_spi = spi_flash_probe(CONFIG_BOOT_DEVICE_SPI_FLASH_BUS, 0); if (!elog_spi) { printk(BIOS_ERR, "ELOG: Unable to find SPI flash\n"); return -1; diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig index 35435a6caf..ee48d676de 100644 --- a/src/drivers/spi/Kconfig +++ b/src/drivers/spi/Kconfig @@ -23,6 +23,13 @@ config SPI_FLASH if SPI_FLASH +# Keep at 0 because lots of boards assume this default. +config BOOT_DEVICE_SPI_FLASH_BUS + int + default 0 + help + Which SPI bus the boot device is connected to. + config SPI_FLASH_INCLUDE_ALL_DRIVERS bool default n if COMMON_CBFS_SPI_WRAPPER -- cgit v1.2.3