diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig
index 40f8830855..7776d5bb2f 100644
--- a/src/drivers/spi/Kconfig
+++ b/src/drivers/spi/Kconfig
@@ -22,6 +22,11 @@ config SPI_FLASH
 
 if SPI_FLASH
 
+config SPI_FLASH_INCLUDE_ALL_DRIVERS
+	bool
+	default n if COMMON_CBFS_SPI_WRAPPER
+	default y
+
 config SPI_ATOMIC_SEQUENCING
 	bool
 	default y if ARCH_X86
@@ -48,70 +53,70 @@ config SPI_FLASH_NO_FAST_READ
 
 config SPI_FLASH_ADESTO
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by Adesto Technologies.
 
 config SPI_FLASH_AMIC
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by AMIC.
 
 config SPI_FLASH_ATMEL
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by Atmel.
 
 config SPI_FLASH_EON
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by EON.
 
 config SPI_FLASH_GIGADEVICE
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by Gigadevice.
 
 config SPI_FLASH_MACRONIX
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by Macronix.
 
 config SPI_FLASH_SPANSION
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by Spansion.
 
 config SPI_FLASH_SST
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by SST.
 
 config SPI_FLASH_STMICRO
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by ST MICRO.
 
 config SPI_FLASH_WINBOND
 	bool
-	default y if !COMMON_CBFS_SPI_WRAPPER
+	default y if SPI_FLASH_INCLUDE_ALL_DRIVERS
 	help
 	  Select this option if your chipset driver needs to store certain
 	  data in the SPI flash and your SPI flash is made by Winbond.