diff --git a/drivers/Kconfig b/drivers/Kconfig
index 9b508fdd7f..4ac8a9d0c6 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -345,9 +345,7 @@ menuconfig SPI
 		should be enabled by all platforms that support SPI interfaces.
 		See include/nuttx/spi/spi.h for further SPI driver information.
 
-if SPI
 source drivers/spi/Kconfig
-endif
 
 menuconfig I2S
 	bool "I2S Driver Support"
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index ea8b8ac9ab..177d863ee2 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -3,6 +3,18 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
+config ARCH_HAVE_SPI_CRCGENERATION
+	bool
+	default n
+
+config ARCH_HAVE_SPI_CS_CONTROL
+	bool
+	default n
+
+config ARCH_HAVE_SPI_BITORDER
+	bool
+	default n
+
 if SPI
 
 config SPI_SLAVE
@@ -55,10 +67,6 @@ config SPI_HWFEATURES
 		basically the OR of any specific hardware feature and eanbles
 		the SPI hwfeatures() interface method.
 
-config ARCH_HAVE_SPI_CRCGENERATION
-	bool
-	default n
-
 config SPI_CRCGENERATION
 	bool
 	default n
@@ -69,10 +77,6 @@ config SPI_CRCGENERATION
 		generation of SPI CRCs.  Enables the HWFEAT_CRCGENERATION option
 		as well as the hwfeartures() interface method.
 
-config ARCH_HAVE_SPI_CS_CONTROL
-	bool
-	default n
-
 config SPI_CS_CONTROL
 	bool "SPI CS Behavior Control"
 	default n
@@ -82,10 +86,6 @@ config SPI_CS_CONTROL
 		Enables possibilities to define the behavior of CS.
 		Also enables the hwfeatures() interface method.
 
-config ARCH_HAVE_SPI_BITORDER
-	bool
-	default n
-
 config SPI_BITORDER
 	bool "SPI Bit Order Control"
 	default n