diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index c2d2eaed79..0d69da23ca 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -106,7 +106,6 @@ 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
diff --git a/src/soc/intel/common/block/fast_spi/Kconfig b/src/soc/intel/common/block/fast_spi/Kconfig
index 4bd1f59de6..936927219d 100644
--- a/src/soc/intel/common/block/fast_spi/Kconfig
+++ b/src/soc/intel/common/block/fast_spi/Kconfig
@@ -1,5 +1,6 @@
 config SOC_INTEL_COMMON_BLOCK_FAST_SPI
 	bool
+	select SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS
 	help
 	  Intel Processor common FAST_SPI support
 
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index a2fbdff8c6..9674024073 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -77,7 +77,6 @@ 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"