diff --git a/drivers/Kconfig b/drivers/Kconfig
index afb2c4296..5a0715242 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -29,7 +29,7 @@ config DRIVER_CFI_NEW
 	  breaks something.
 
 config DRIVER_CFI_OLD
-	bool
+	bool "old cfi flash driver"
 	default y
 	depends on !DRIVER_CFI_NEW
 
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 1c48ceac7..3eebd0898 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -1,14 +1,16 @@
 menu "SPI drivers                   "
 
 config SPI
-	bool
+	bool "Enable SPI driver support"
 	default y
 
 config DRIVER_SPI_IMX
 	bool "i.MX SPI Master driver"
 	depends on ARCH_IMX
+	depends on SPI
 
 config DRIVER_SPI_MC13783
 	bool "MC13783 a.k.a. PMIC driver"
+	depends on SPI
 
 endmenu
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index daef09900..81f2c6bc6 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -1,4 +1,4 @@
-obj-y += spi.o
+obj-$(CONFIG_SPI) += spi.o
 obj-$(CONFIG_DRIVER_SPI_IMX) += imx_spi.o
 
 obj-$(CONFIG_DRIVER_SPI_MC13783) += mc13783.o
diff --git a/fs/Kconfig b/fs/Kconfig
index 43135e28d..3e9de96fa 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -6,4 +6,14 @@ config FS_CRAMFS
 	select ZLIB
 	prompt "cramfs support"
 
+config FS_RAMFS
+	bool
+	default y
+	prompt "ramfs support"
+
+config FS_DEVFS
+	bool
+	default y
+	prompt "devfs support"
+
 endmenu
diff --git a/fs/Makefile b/fs/Makefile
index 57268cc70..228af6eb2 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_FS_CRAMFS)	+= cramfs/
+obj-$(CONFIG_FS_RAMFS)	+= ramfs.o
+obj-$(CONFIG_FS_DEVFS)	+= devfs.o
 obj-y	+= fs.o
-obj-y	+= ramfs.o
-obj-y	+= devfs.o