diff --git a/configs/amber/hello/defconfig b/configs/amber/hello/defconfig
index 7e3d4ad70c4..8bdb55db482 100644
--- a/configs/amber/hello/defconfig
+++ b/configs/amber/hello/defconfig
@@ -226,7 +226,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index acca1fbac36..bd2f3703f46 100755
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -245,7 +245,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 084c6623329..72d0c3ae351 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -245,7 +245,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 8f4bd6927ce..3280b7c16aa 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -265,4 +265,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 71065fc662b..131e73f52cf 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -265,4 +265,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 3750f9e5da2..49fc8f9d06b 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -265,4 +265,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/c5471evm/ostest/defconfig b/configs/c5471evm/ostest/defconfig
index f4d7b8c3653..13013a2bd48 100644
--- a/configs/c5471evm/ostest/defconfig
+++ b/configs/c5471evm/ostest/defconfig
@@ -265,4 +265,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index d67674f4e18..a6868e8698f 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -284,4 +284,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index e8c53947b8f..058dc2aa29a 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -286,4 +286,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index 1d405874eb5..ee1405ca5eb 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -330,4 +330,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index 79224989f2b..3222b63eea8 100755
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -219,7 +219,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 8c7b351af49..43510fa5954 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -225,6 +225,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SDIO-based MMC/SD driver
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 19838ceab4b..6da813d9ec2 100644
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -225,6 +225,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SDIO-based MMC/SD driver
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 1cc2bec7e2d..2a9eeff939b 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -268,6 +268,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SDIO-based MMC/SD driver
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index a82f69877a2..40c0897f734 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -228,6 +228,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SDIO-based MMC/SD driver
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index a957fb3ab86..0659383a611 100644
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -229,6 +229,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SDIO-based MMC/SD driver
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 6d0bb63f055..d4d978649b2 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -226,6 +226,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SDIO-based MMC/SD driver
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index bd0ac7664df..bb663644582 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -221,7 +221,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index 9b1f616c6e2..8f969ee795d 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -221,7 +221,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 079bbc60e37..ed1c7b074b5 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -223,7 +223,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 110f906cbe0..590a30516cc 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -227,7 +227,7 @@ CONFIG_FS_ROMFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index 6d3b4ddad04..229aec59cc2 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -221,7 +221,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 2aca2582ec4..7e1282368f5 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -228,7 +228,7 @@ CONFIG_FS_ROMFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index adb9bb5fae4..0bf59edf4eb 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -240,7 +240,7 @@ CONFIG_NFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ekk-lm3s9b96/ostest/defconfig b/configs/ekk-lm3s9b96/ostest/defconfig
index 82150203662..3ac3c066a1d 100644
--- a/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/configs/ekk-lm3s9b96/ostest/defconfig
@@ -239,7 +239,7 @@ CONFIG_NFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 80c9e682eae..d8617782826 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -222,7 +222,7 @@ CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=20000000
-CONFIG_MMCSD_SDIO=y
+# CONFIG_MMCSD_SDIO is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_MTD is not set
 # CONFIG_PIPES is not set
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 95baadc13b6..043526165ce 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -209,7 +209,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 6a910ee0bb3..329b9705354 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -209,7 +209,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 22cf35a0c45..94eedae20f2 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -209,7 +209,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 8ad3930fff8..7b8f12a4107 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -209,7 +209,7 @@ CONFIG_FS_ROMFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 88c1b727911..e414cfcc140 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -225,7 +225,7 @@ CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=20000000
-CONFIG_MMCSD_SDIO=y
+# CONFIG_MMCSD_SDIO is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_MTD is not set
 # CONFIG_PIPES is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index 82cea4fcf29..23c9fe747dc 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -209,7 +209,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index e90ded32ade..fc258df0c40 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -277,6 +277,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index eeb3b09ffd9..5736aadc85a 100755
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -274,6 +274,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index ecf4c3a3d81..7183a8632c4 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -308,6 +308,7 @@ CONFIG_FS_WRITEBUFFER=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # STM32 SDIO-based MMC/SD driver
diff --git a/configs/hymini-stm32v/nx/defconfig b/configs/hymini-stm32v/nx/defconfig
index c6e04914209..4e522cfd829 100644
--- a/configs/hymini-stm32v/nx/defconfig
+++ b/configs/hymini-stm32v/nx/defconfig
@@ -291,6 +291,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/hymini-stm32v/nxlines/defconfig b/configs/hymini-stm32v/nxlines/defconfig
index fb968c483a0..7d1e8b9753d 100644
--- a/configs/hymini-stm32v/nxlines/defconfig
+++ b/configs/hymini-stm32v/nxlines/defconfig
@@ -295,6 +295,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 0c7317a007e..b53a79dd893 100755
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -277,6 +277,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/hymini-stm32v/usbstorage/defconfig b/configs/hymini-stm32v/usbstorage/defconfig
index 16f43a1ce8e..d89a33a03e1 100755
--- a/configs/hymini-stm32v/usbstorage/defconfig
+++ b/configs/hymini-stm32v/usbstorage/defconfig
@@ -284,6 +284,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index ff8c39c1fbd..826af71b831 100755
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -286,6 +286,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index 908b01e3a58..abdea0c8628 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -258,7 +258,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lincoln60/ostest/defconfig b/configs/lincoln60/ostest/defconfig
index ea42f57638f..8ab244f0dbb 100644
--- a/configs/lincoln60/ostest/defconfig
+++ b/configs/lincoln60/ostest/defconfig
@@ -268,7 +268,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index a09bc6717d1..cb3bbdeb4d4 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -238,7 +238,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lm3s6432-s2e/ostest/defconfig b/configs/lm3s6432-s2e/ostest/defconfig
index 9387fd0868b..a3ec7242225 100644
--- a/configs/lm3s6432-s2e/ostest/defconfig
+++ b/configs/lm3s6432-s2e/ostest/defconfig
@@ -237,7 +237,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 5c288f95ddc..ccda5d9e85e 100755
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -280,7 +280,7 @@ CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=12500000
-CONFIG_MMCSD_SDIO=y
+# CONFIG_MMCSD_SDIO is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_MTD is not set
 # CONFIG_NETDEVICES is not set
diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig
index 67633c91668..7a1b0eb0aa9 100755
--- a/configs/lm3s6965-ek/ostest/defconfig
+++ b/configs/lm3s6965-ek/ostest/defconfig
@@ -259,7 +259,7 @@ CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=12500000
-CONFIG_MMCSD_SDIO=y
+# CONFIG_MMCSD_SDIO is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_MTD is not set
 # CONFIG_PIPES is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 4a35f8d4a9d..f49b977aa2b 100755
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -238,7 +238,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 3ca6ade2162..b92bd8e95d6 100755
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -252,7 +252,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig
index 169ac9c8f5f..cdf0477bcf2 100755
--- a/configs/lm3s8962-ek/ostest/defconfig
+++ b/configs/lm3s8962-ek/ostest/defconfig
@@ -237,7 +237,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index 78b9e3f715d..99c9200782f 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -330,6 +330,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpc4330-xplorer/ostest/defconfig b/configs/lpc4330-xplorer/ostest/defconfig
index 342fe04a08f..fc853de176a 100644
--- a/configs/lpc4330-xplorer/ostest/defconfig
+++ b/configs/lpc4330-xplorer/ostest/defconfig
@@ -327,6 +327,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 2e0d2eea661..824fcfb2c39 100755
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -270,7 +270,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 23f375a47a7..c11cf623f1b 100755
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -266,7 +266,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 3f8474103ac..d4b3b895386 100755
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -283,7 +283,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpcxpresso-lpc1768/ostest/defconfig b/configs/lpcxpresso-lpc1768/ostest/defconfig
index 10b63eb2d13..831b717b9ab 100755
--- a/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/configs/lpcxpresso-lpc1768/ostest/defconfig
@@ -268,7 +268,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index b6ea25948f3..299750371d7 100755
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -270,7 +270,7 @@ CONFIG_FS_ROMFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index 9e4bcb15d6e..fd055ee02c0 100755
--- a/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbstorage/defconfig
@@ -264,7 +264,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index 4c402018477..7e49073a9d6 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -216,4 +216,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index b4bf00872d7..94b007355b3 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -263,7 +263,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 2156af80ef5..40a230b5240 100755
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -258,7 +258,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 04fbe2b9e7a..682facbabd7 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -199,7 +199,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index 9d59439be53..7d0c5015787 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -197,7 +197,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 3097f7d7830..c9f528c376e 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -197,7 +197,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index 7b22bf6b0ed..4273315c69e 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -199,7 +199,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/micropendous3/hello/defconfig b/configs/micropendous3/hello/defconfig
index ebc755abcca..2708c5d52ed 100644
--- a/configs/micropendous3/hello/defconfig
+++ b/configs/micropendous3/hello/defconfig
@@ -221,7 +221,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 6e0d3bf70a8..9beaf67280e 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -285,7 +285,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index ed50e0325c4..50929eb0e4d 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -285,7 +285,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mirtoo/ostest/defconfig b/configs/mirtoo/ostest/defconfig
index 5c8b6978547..7c8596dbf44 100644
--- a/configs/mirtoo/ostest/defconfig
+++ b/configs/mirtoo/ostest/defconfig
@@ -276,7 +276,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 54dbf6cce48..d432b84691e 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -328,4 +328,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index e6e0df700ed..a730c93ebff 100755
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -225,7 +225,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index dd2aff53c34..ee70127e3c0 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -324,4 +324,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 98de53fe033..83f0dde793a 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -355,4 +355,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 5d606453b15..94a946db376 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -320,4 +320,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index e43eccce564..d808688837e 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -331,4 +331,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index fbb6d644f98..632e9a16e6b 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -399,4 +399,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 5859279d0b5..3d79e75acb7 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -332,4 +332,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index 69387e7f6d9..6e08a370240 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -332,4 +332,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 2c440bc7f24..8f3e5097157 100755
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -259,7 +259,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig
index c32b1e715f9..8f6cc8ac1d2 100755
--- a/configs/nucleus2g/ostest/defconfig
+++ b/configs/nucleus2g/ostest/defconfig
@@ -258,7 +258,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index abe9ac0203e..edd2160b403 100755
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -259,7 +259,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/nucleus2g/usbstorage/defconfig b/configs/nucleus2g/usbstorage/defconfig
index adab8f4f0e1..8ea4614beaa 100755
--- a/configs/nucleus2g/usbstorage/defconfig
+++ b/configs/nucleus2g/usbstorage/defconfig
@@ -260,7 +260,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 8ff0d95aafe..15b26899b04 100755
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -281,7 +281,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 6346011879f..fce1ed26f09 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -329,7 +329,7 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_HAVECARDDETECT is not set
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=12500000
-CONFIG_MMCSD_SDIO=y
+# CONFIG_MMCSD_SDIO=y is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_MTD is not set
 # CONFIG_PIPES is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 4ab823b8c7a..5b6b3d676b0 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -273,7 +273,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 096f08a8a85..8ed82a3edd6 100755
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -285,7 +285,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index 28ad229d6b1..f27acf40e67 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -286,7 +286,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index 02732e74a51..f341a49c423 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -268,7 +268,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 9becdee0461..259457cf6c1 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -278,7 +278,7 @@ CONFIG_FS_ROMFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index fe42a861f91..f684dcde303 100755
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -276,7 +276,7 @@ CONFIG_FS_ROMFS=y
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 995cbad5987..122e61485c4 100755
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -269,7 +269,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc1766stk/usbstorage/defconfig b/configs/olimex-lpc1766stk/usbstorage/defconfig
index e11c2c404e0..51743e02020 100755
--- a/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -270,7 +270,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index fcddbaaca0d..c6728adb749 100755
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -214,7 +214,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-lpc2378/ostest/defconfig b/configs/olimex-lpc2378/ostest/defconfig
index b7216c7c4a4..01e1918fde3 100755
--- a/configs/olimex-lpc2378/ostest/defconfig
+++ b/configs/olimex-lpc2378/ostest/defconfig
@@ -214,7 +214,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 0a831ce9fcb..09d447e1450 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -316,6 +316,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-stm32-p107/ostest/defconfig b/configs/olimex-stm32-p107/ostest/defconfig
index 272832381e0..6bc065784ce 100644
--- a/configs/olimex-stm32-p107/ostest/defconfig
+++ b/configs/olimex-stm32-p107/ostest/defconfig
@@ -324,6 +324,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index a8767c7be1d..bc95f0c02d9 100755
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -248,7 +248,7 @@ CONFIG_ENC28J60_HALFDUPPLEX=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index b621945ed6b..886498eae6c 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -231,7 +231,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index 02804cd67e3..b5621315a60 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -231,7 +231,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 6f1ef7dc902..fe24cb886fe 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -273,7 +273,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pcblogic-pic32mx/ostest/defconfig b/configs/pcblogic-pic32mx/ostest/defconfig
index 1df428f8ae7..19196eae943 100644
--- a/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/configs/pcblogic-pic32mx/ostest/defconfig
@@ -263,7 +263,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pic32-starterkit/nsh/defconfig b/configs/pic32-starterkit/nsh/defconfig
index f1c543e5f07..8bf0432e287 100644
--- a/configs/pic32-starterkit/nsh/defconfig
+++ b/configs/pic32-starterkit/nsh/defconfig
@@ -356,7 +356,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pic32-starterkit/nsh2/defconfig b/configs/pic32-starterkit/nsh2/defconfig
index f681b7689e8..fb54a2949f0 100644
--- a/configs/pic32-starterkit/nsh2/defconfig
+++ b/configs/pic32-starterkit/nsh2/defconfig
@@ -355,7 +355,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pic32-starterkit/ostest/defconfig b/configs/pic32-starterkit/ostest/defconfig
index 6a077f2097f..39f7d04af6c 100644
--- a/configs/pic32-starterkit/ostest/defconfig
+++ b/configs/pic32-starterkit/ostest/defconfig
@@ -353,7 +353,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 66cd240e22e..62f524ee2a7 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -371,7 +371,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pic32mx7mmb/ostest/defconfig b/configs/pic32mx7mmb/ostest/defconfig
index 7cb71995eb0..4595913cdd9 100644
--- a/configs/pic32mx7mmb/ostest/defconfig
+++ b/configs/pic32mx7mmb/ostest/defconfig
@@ -353,7 +353,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index b41d74e3150..43c2347a9f9 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -215,4 +215,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 792157fe0ee..09e252e0b91 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -316,4 +316,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index b0036289a8a..aeae97df1d6 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -232,4 +232,4 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
diff --git a/configs/rgmp/arm/default/defconfig b/configs/rgmp/arm/default/defconfig
index 0c40e8bd212..88843e365dc 100644
--- a/configs/rgmp/arm/default/defconfig
+++ b/configs/rgmp/arm/default/defconfig
@@ -226,7 +226,7 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 ##########################################
 # RGMP specific configuration
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index 0ae14b14181..47c685aae4a 100644
--- a/configs/rgmp/arm/nsh/defconfig
+++ b/configs/rgmp/arm/nsh/defconfig
@@ -227,7 +227,7 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 ##########################################
 # RGMP specific configuration
diff --git a/configs/rgmp/x86/cxxtest/defconfig b/configs/rgmp/x86/cxxtest/defconfig
index 1d2996557f3..b1634e1e50a 100644
--- a/configs/rgmp/x86/cxxtest/defconfig
+++ b/configs/rgmp/x86/cxxtest/defconfig
@@ -332,7 +332,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # Settings for examples/uip
diff --git a/configs/rgmp/x86/default/defconfig b/configs/rgmp/x86/default/defconfig
index 070ffcb30bb..383e0ff5fdd 100644
--- a/configs/rgmp/x86/default/defconfig
+++ b/configs/rgmp/x86/default/defconfig
@@ -187,7 +187,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # Settings for examples/uip
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index c8400560a9d..1591952242f 100644
--- a/configs/rgmp/x86/helloxx/defconfig
+++ b/configs/rgmp/x86/helloxx/defconfig
@@ -394,7 +394,7 @@ CONFIG_USER_ENTRYPOINT="helloxx_main"
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # uClibc++ Standard C++ Library
diff --git a/configs/rgmp/x86/nsh/defconfig b/configs/rgmp/x86/nsh/defconfig
index 891d58ba8fb..6f10b234a22 100644
--- a/configs/rgmp/x86/nsh/defconfig
+++ b/configs/rgmp/x86/nsh/defconfig
@@ -236,7 +236,7 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 ##########################################
 # RGMP specific configuration
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 30f60f0e325..709c3e78507 100755
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -274,6 +274,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 9715984649e..38520a9aae8 100755
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -249,6 +249,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index dd55d9c9329..a21a6570dee 100755
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -258,6 +258,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index bf15cb1a59b..5125f5ba916 100755
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -250,6 +250,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sam3u-ek/touchscreen/defconfig b/configs/sam3u-ek/touchscreen/defconfig
index 414eadb6ebb..278c55478d0 100755
--- a/configs/sam3u-ek/touchscreen/defconfig
+++ b/configs/sam3u-ek/touchscreen/defconfig
@@ -283,6 +283,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index d5e108782c2..7caa878525d 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -223,11 +223,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 1df980ea83a..c216e2edc80 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -222,11 +222,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 2d627a66de1..794b3107dff 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -267,11 +267,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index c9e5b343f06..b7e31b9e32e 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -369,11 +369,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 714d5dbb6a0..0fddca09663 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -323,11 +323,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index c8aadee2575..79f5b0f93a9 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -232,11 +232,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index fedf401d857..b40ec626ec0 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -211,11 +211,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index df2a0553c85..6a2e3e304dd 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -318,11 +318,3 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=8192
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
-
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index cf93d5b10a1..40ff5b3a142 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -324,4 +324,5 @@ CONFIG_HEAP_SIZE=
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
+
diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig
index 6d84e7c3626..662537a9d74 100755
--- a/configs/stm3210e-eval/RIDE/defconfig
+++ b/configs/stm3210e-eval/RIDE/defconfig
@@ -282,6 +282,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 37e19171feb..3c8fca22271 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -293,6 +293,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index 7fee3379431..b5c39f9288e 100755
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -299,6 +299,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index b5e52e4944d..12ebc34c22f 100755
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -290,6 +290,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 30a0bb3276f..063307143b5 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -355,6 +355,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 0ad42dfbe55..bff03161776 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -307,6 +307,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig
index 7dd5878bf47..94dbf500f24 100644
--- a/configs/stm3210e-eval/nxconsole/defconfig
+++ b/configs/stm3210e-eval/nxconsole/defconfig
@@ -308,6 +308,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig
index 068a17acb43..760b3a6e1ef 100644
--- a/configs/stm3210e-eval/nxlines/defconfig
+++ b/configs/stm3210e-eval/nxlines/defconfig
@@ -307,6 +307,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig
index b6f88a3caca..d8b1fbe1eff 100644
--- a/configs/stm3210e-eval/nxtext/defconfig
+++ b/configs/stm3210e-eval/nxtext/defconfig
@@ -307,6 +307,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index 0553b1a9844..eb14399ea02 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/configs/stm3210e-eval/ostest/defconfig
@@ -302,6 +302,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index 61bd995c8b3..c113ddf60bd 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -386,6 +386,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 94059c07c3f..c1f935e9657 100755
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -292,6 +292,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index 5c1ed5fb294..3e711935329 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -299,6 +299,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index 29baf9af06d..627136ebba1 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -363,6 +363,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 08e04ad0ed9..39c1bb8edfc 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -363,6 +363,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index bd9d028605d..8486c4fd6f0 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -409,6 +409,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index b5fe843bcad..bc641b8be64 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -408,6 +408,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3220g-eval/ostest/defconfig b/configs/stm3220g-eval/ostest/defconfig
index f63f96c9af9..3ec4175161a 100644
--- a/configs/stm3220g-eval/ostest/defconfig
+++ b/configs/stm3220g-eval/ostest/defconfig
@@ -353,6 +353,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index f529198f177..b89e7d4f779 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -363,6 +363,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index 5199cf85c3c..91682111bf5 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -369,6 +369,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index c5e0da795a6..257a4d25200 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -369,6 +369,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 6c19ed531dc..82caf162263 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -414,6 +414,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 08690ade3f1..9e7d57adee0 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -414,6 +414,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/nxconsole/defconfig b/configs/stm3240g-eval/nxconsole/defconfig
index 202fa4378c0..92c3ceb75eb 100644
--- a/configs/stm3240g-eval/nxconsole/defconfig
+++ b/configs/stm3240g-eval/nxconsole/defconfig
@@ -413,6 +413,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index a220af2d1c1..34eaa9ec6d7 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -415,6 +415,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/ostest/defconfig b/configs/stm3240g-eval/ostest/defconfig
index fcc54aa4bd7..f9e690a1032 100644
--- a/configs/stm3240g-eval/ostest/defconfig
+++ b/configs/stm3240g-eval/ostest/defconfig
@@ -358,6 +358,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index 5aef41c27b9..ec04476b776 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -369,6 +369,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 6d09968e9fe..792eafa0a1b 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -414,6 +414,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 98034e22ebc..d9917b3a85b 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -376,14 +376,6 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-
 #
 # SPI-based MMC/SD driver
 #
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 3e24168cde5..1636f6ecb09 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -395,14 +395,6 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=n
 
-#
-# Maintain legacy build behavior (revisit)
-#
-
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-
 #
 # SPI-based MMC/SD driver
 #
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 07b31a1aea2..d15bac1f451 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -285,7 +285,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sure-pic32mx/ostest/defconfig b/configs/sure-pic32mx/ostest/defconfig
index 86bb3b30736..a04f2171aae 100644
--- a/configs/sure-pic32mx/ostest/defconfig
+++ b/configs/sure-pic32mx/ostest/defconfig
@@ -264,7 +264,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 9f6046f2169..3ebfde8343c 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -282,7 +282,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/teensy/hello/defconfig b/configs/teensy/hello/defconfig
index 8fafe1a1040..cc2b6c9c1a2 100644
--- a/configs/teensy/hello/defconfig
+++ b/configs/teensy/hello/defconfig
@@ -221,7 +221,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/teensy/nsh/defconfig b/configs/teensy/nsh/defconfig
index faeb0b10309..0cc8777315d 100755
--- a/configs/teensy/nsh/defconfig
+++ b/configs/teensy/nsh/defconfig
@@ -221,7 +221,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/teensy/usbstorage/defconfig b/configs/teensy/usbstorage/defconfig
index 1f018689764..590a6f8bbe0 100755
--- a/configs/teensy/usbstorage/defconfig
+++ b/configs/teensy/usbstorage/defconfig
@@ -222,7 +222,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 3f272b55a2d..959379bea23 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -286,6 +286,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/twr-k60n512/ostest/defconfig b/configs/twr-k60n512/ostest/defconfig
index fd27ffc2bc2..14d3435da5d 100644
--- a/configs/twr-k60n512/ostest/defconfig
+++ b/configs/twr-k60n512/ostest/defconfig
@@ -285,6 +285,7 @@ CONFIG_FS_ROMFS=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 89afd591298..8769fa677c4 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -272,7 +272,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index 2405dc2d3b3..5bf0bd71d6c 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -197,7 +197,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index e910f112f2c..5b40baf88ce 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -197,7 +197,7 @@ CONFIG_FS_ROMFS=n
 
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index 2b7d8a20cdd..5952f47240a 100755
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -333,6 +333,7 @@ CONFIG_I2C_SLAVE=n
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
diff --git a/drivers/mtd/Make.defs b/drivers/mtd/Make.defs
index 7db7592d4e3..3102f1447d7 100644
--- a/drivers/mtd/Make.defs
+++ b/drivers/mtd/Make.defs
@@ -37,6 +37,8 @@
 
 # Include MTD drivers
 
+ifeq ($(CONFIG_MTD),y)
+
 CSRCS += at45db.c flash_eraseall.c ftl.c m25px.c rammtd.c ramtron.c
 
 ifeq ($(CONFIG_MTD_AT24XX),y)
@@ -60,3 +62,4 @@ endif
 DEPPATH += --dep-path mtd
 VPATH += :mtd
 
+endif