From 3e7f00628018067c8152fe50b4873f0b31d27a25 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Sat, 11 Jan 2020 10:26:25 -0700 Subject: [PATCH] drives/spi/spi_flash: add option to not select all drivers Add a new Kconfig option, SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS, to make it easier for other parts of the code base to indicate that all spi flash drivers should not be included. Change-Id: Ibf2c4f1d2b8a73cff14bb627ddf759d7970920ea Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/c/coreboot/+/38362 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/drivers/spi/Kconfig | 7 ++++++- src/soc/intel/apollolake/Kconfig | 5 +---- src/soc/intel/skylake/Kconfig | 5 +---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig index a4be84d814..c9d94d9f4b 100644 --- a/src/drivers/spi/Kconfig +++ b/src/drivers/spi/Kconfig @@ -61,9 +61,14 @@ config BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY Include the common implementation in all stages, including the early ones. +config SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS + bool + default y if COMMON_CBFS_SPI_WRAPPER + default n + config SPI_FLASH_INCLUDE_ALL_DRIVERS bool - default n if COMMON_CBFS_SPI_WRAPPER + default n if SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS default y config SPI_FLASH_SMM diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 2f4ebb0540..c2d2eaed79 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -106,6 +106,7 @@ config CPU_SPECIFIC_OPTIONS select NO_UART_ON_SUPERIO select INTEL_GMA_ACPI select INTEL_GMA_SWSMISCI + select SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC @@ -341,10 +342,6 @@ config L2_CACHE_SIZE default 0x400000 if SOC_INTEL_GLK default 0x100000 -config SPI_FLASH_INCLUDE_ALL_DRIVERS - bool - default n - config SMM_RESERVED_SIZE hex default 0x100000 diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index d90fb6b9fb..a2fbdff8c6 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -77,6 +77,7 @@ config CPU_SPECIFIC_OPTIONS select TSC_SYNC_MFENCE select UDELAY_TSC select UDK_2015_BINDING + select SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS config FSP_HYPERTHREADING bool "Enable Hyper-Threading" @@ -232,10 +233,6 @@ config FSP_FD_PATH depends on FSP_USE_REPO default "3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd" -config SPI_FLASH_INCLUDE_ALL_DRIVERS - bool - default n - config MAX_ROOT_PORTS int default 24