summaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-15 00:03:58 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-01-15 00:03:58 +0000
commit033512b6c83b46c4c052499faba7cc4b02ff4153 (patch)
treee58bfa1dec5a2203c7ac3e9823d2c624c6bd9ffb /nuttx/configs
parent18fb56f8c1c8676028f1235c0567d2d9a0171c2d (diff)
downloadpx4-nuttx-033512b6c83b46c4c052499faba7cc4b02ff4153.tar.gz
px4-nuttx-033512b6c83b46c4c052499faba7cc4b02ff4153.tar.bz2
px4-nuttx-033512b6c83b46c4c052499faba7cc4b02ff4153.zip
Don't build drivers/mtd unless CONFIG_MTD is defined (Denis Carikli)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5519 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/amber/hello/defconfig2
-rwxr-xr-xnuttx/configs/avr32dev1/nsh/defconfig2
-rwxr-xr-xnuttx/configs/avr32dev1/ostest/defconfig2
-rw-r--r--nuttx/configs/c5471evm/httpd/defconfig2
-rw-r--r--nuttx/configs/c5471evm/nettest/defconfig2
-rw-r--r--nuttx/configs/c5471evm/nsh/defconfig2
-rw-r--r--nuttx/configs/c5471evm/ostest/defconfig2
-rw-r--r--nuttx/configs/compal_e88/nsh_highram/defconfig2
-rw-r--r--nuttx/configs/compal_e99/nsh_compalram/defconfig2
-rw-r--r--nuttx/configs/compal_e99/nsh_highram/defconfig2
-rwxr-xr-xnuttx/configs/demo9s12ne64/ostest/defconfig2
-rw-r--r--nuttx/configs/ea3131/nsh/defconfig1
-rw-r--r--nuttx/configs/ea3131/ostest/defconfig1
-rw-r--r--nuttx/configs/ea3131/pgnsh/defconfig1
-rw-r--r--nuttx/configs/ea3131/usbserial/defconfig1
-rw-r--r--nuttx/configs/ea3131/usbstorage/defconfig1
-rw-r--r--nuttx/configs/ea3152/ostest/defconfig1
-rw-r--r--nuttx/configs/eagle100/httpd/defconfig2
-rw-r--r--nuttx/configs/eagle100/nettest/defconfig2
-rw-r--r--nuttx/configs/eagle100/nsh/defconfig2
-rw-r--r--nuttx/configs/eagle100/nxflat/defconfig2
-rw-r--r--nuttx/configs/eagle100/ostest/defconfig2
-rw-r--r--nuttx/configs/eagle100/thttpd/defconfig2
-rw-r--r--nuttx/configs/ekk-lm3s9b96/nsh/defconfig2
-rw-r--r--nuttx/configs/ekk-lm3s9b96/ostest/defconfig2
-rw-r--r--nuttx/configs/ez80f910200kitg/ostest/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/dhcpd/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/httpd/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/nettest/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/nsh/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/ostest/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/poll/defconfig2
-rw-r--r--nuttx/configs/hymini-stm32v/buttons/defconfig1
-rwxr-xr-xnuttx/configs/hymini-stm32v/nsh/defconfig1
-rw-r--r--nuttx/configs/hymini-stm32v/nsh2/defconfig1
-rw-r--r--nuttx/configs/hymini-stm32v/nx/defconfig1
-rw-r--r--nuttx/configs/hymini-stm32v/nxlines/defconfig1
-rwxr-xr-xnuttx/configs/hymini-stm32v/usbserial/defconfig1
-rwxr-xr-xnuttx/configs/hymini-stm32v/usbstorage/defconfig1
-rwxr-xr-xnuttx/configs/kwikstik-k40/ostest/defconfig1
-rw-r--r--nuttx/configs/lincoln60/nsh/defconfig2
-rw-r--r--nuttx/configs/lincoln60/ostest/defconfig2
-rw-r--r--nuttx/configs/lm3s6432-s2e/nsh/defconfig2
-rw-r--r--nuttx/configs/lm3s6432-s2e/ostest/defconfig2
-rwxr-xr-xnuttx/configs/lm3s6965-ek/nsh/defconfig2
-rwxr-xr-xnuttx/configs/lm3s6965-ek/ostest/defconfig2
-rwxr-xr-xnuttx/configs/lm3s8962-ek/nsh/defconfig2
-rwxr-xr-xnuttx/configs/lm3s8962-ek/nx/defconfig2
-rwxr-xr-xnuttx/configs/lm3s8962-ek/ostest/defconfig2
-rw-r--r--nuttx/configs/lpc4330-xplorer/nsh/defconfig1
-rw-r--r--nuttx/configs/lpc4330-xplorer/ostest/defconfig1
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig2
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/nsh/defconfig2
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/nx/defconfig2
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/ostest/defconfig2
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig2
-rwxr-xr-xnuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig2
-rw-r--r--nuttx/configs/m68332evb/defconfig2
-rw-r--r--nuttx/configs/mbed/hidkbd/defconfig2
-rwxr-xr-xnuttx/configs/mbed/nsh/defconfig2
-rw-r--r--nuttx/configs/mcu123-lpc214x/composite/defconfig2
-rw-r--r--nuttx/configs/mcu123-lpc214x/ostest/defconfig2
-rw-r--r--nuttx/configs/mcu123-lpc214x/usbserial/defconfig2
-rw-r--r--nuttx/configs/mcu123-lpc214x/usbstorage/defconfig2
-rw-r--r--nuttx/configs/micropendous3/hello/defconfig2
-rw-r--r--nuttx/configs/mirtoo/nsh/defconfig2
-rw-r--r--nuttx/configs/mirtoo/nxffs/defconfig2
-rw-r--r--nuttx/configs/mirtoo/ostest/defconfig2
-rw-r--r--nuttx/configs/mx1ads/ostest/defconfig2
-rwxr-xr-xnuttx/configs/ne64badge/ostest/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/nettest/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/nsh/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/ostest/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/poll/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/thttpd/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/udp/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/uip/defconfig2
-rwxr-xr-xnuttx/configs/nucleus2g/nsh/defconfig2
-rwxr-xr-xnuttx/configs/nucleus2g/ostest/defconfig2
-rwxr-xr-xnuttx/configs/nucleus2g/usbserial/defconfig2
-rwxr-xr-xnuttx/configs/nucleus2g/usbstorage/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ftpc/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/hidkbd/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nettest/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nsh/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nx/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ostest/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/thttpd/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbserial/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbstorage/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc2378/nsh/defconfig2
-rwxr-xr-xnuttx/configs/olimex-lpc2378/ostest/defconfig2
-rw-r--r--nuttx/configs/olimex-stm32-p107/nsh/defconfig1
-rw-r--r--nuttx/configs/olimex-stm32-p107/ostest/defconfig1
-rwxr-xr-xnuttx/configs/olimex-strp711/nettest/defconfig2
-rw-r--r--nuttx/configs/olimex-strp711/nsh/defconfig2
-rw-r--r--nuttx/configs/olimex-strp711/ostest/defconfig2
-rw-r--r--nuttx/configs/pcblogic-pic32mx/nsh/defconfig2
-rw-r--r--nuttx/configs/pcblogic-pic32mx/ostest/defconfig2
-rw-r--r--nuttx/configs/pic32-starterkit/nsh/defconfig2
-rw-r--r--nuttx/configs/pic32-starterkit/nsh2/defconfig2
-rw-r--r--nuttx/configs/pic32-starterkit/ostest/defconfig2
-rw-r--r--nuttx/configs/pic32mx7mmb/nsh/defconfig2
-rw-r--r--nuttx/configs/pic32mx7mmb/ostest/defconfig2
-rw-r--r--nuttx/configs/pjrc-8051/defconfig2
-rw-r--r--nuttx/configs/qemu-i486/nsh/defconfig2
-rw-r--r--nuttx/configs/qemu-i486/ostest/defconfig2
-rw-r--r--nuttx/configs/rgmp/arm/default/defconfig2
-rw-r--r--nuttx/configs/rgmp/arm/nsh/defconfig2
-rw-r--r--nuttx/configs/rgmp/x86/cxxtest/defconfig2
-rw-r--r--nuttx/configs/rgmp/x86/default/defconfig2
-rw-r--r--nuttx/configs/rgmp/x86/helloxx/defconfig2
-rw-r--r--nuttx/configs/rgmp/x86/nsh/defconfig2
-rwxr-xr-xnuttx/configs/sam3u-ek/knsh/defconfig1
-rwxr-xr-xnuttx/configs/sam3u-ek/nsh/defconfig1
-rwxr-xr-xnuttx/configs/sam3u-ek/nx/defconfig1
-rwxr-xr-xnuttx/configs/sam3u-ek/ostest/defconfig1
-rwxr-xr-xnuttx/configs/sam3u-ek/touchscreen/defconfig1
-rw-r--r--nuttx/configs/sim/mount/defconfig8
-rw-r--r--nuttx/configs/sim/nettest/defconfig8
-rw-r--r--nuttx/configs/sim/nsh/defconfig8
-rw-r--r--nuttx/configs/sim/nsh2/defconfig8
-rw-r--r--nuttx/configs/sim/nx/defconfig8
-rw-r--r--nuttx/configs/sim/nxffs/defconfig8
-rw-r--r--nuttx/configs/sim/pashello/defconfig8
-rw-r--r--nuttx/configs/sim/touchscreen/defconfig8
-rw-r--r--nuttx/configs/skp16c26/ostest/defconfig3
-rwxr-xr-xnuttx/configs/stm3210e-eval/RIDE/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/buttons/defconfig1
-rwxr-xr-xnuttx/configs/stm3210e-eval/composite/defconfig1
-rwxr-xr-xnuttx/configs/stm3210e-eval/nsh/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/nsh2/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/nx/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/nxconsole/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/nxlines/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/nxtext/defconfig1
-rwxr-xr-xnuttx/configs/stm3210e-eval/ostest/defconfig1
-rw-r--r--nuttx/configs/stm3210e-eval/pm/defconfig1
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbserial/defconfig1
-rwxr-xr-xnuttx/configs/stm3210e-eval/usbstorage/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/dhcpd/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/nettest/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/nsh/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/nsh2/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/ostest/defconfig1
-rw-r--r--nuttx/configs/stm3220g-eval/telnetd/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/dhcpd/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/nettest/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/nsh/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/nsh2/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/nxconsole/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/nxwm/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/ostest/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/telnetd/defconfig1
-rw-r--r--nuttx/configs/stm3240g-eval/webserver/defconfig1
-rw-r--r--nuttx/configs/stm32f4discovery/nsh/defconfig8
-rw-r--r--nuttx/configs/stm32f4discovery/pm/defconfig8
-rw-r--r--nuttx/configs/sure-pic32mx/nsh/defconfig2
-rw-r--r--nuttx/configs/sure-pic32mx/ostest/defconfig2
-rw-r--r--nuttx/configs/sure-pic32mx/usbnsh/defconfig2
-rw-r--r--nuttx/configs/teensy/hello/defconfig2
-rwxr-xr-xnuttx/configs/teensy/nsh/defconfig2
-rwxr-xr-xnuttx/configs/teensy/usbstorage/defconfig2
-rw-r--r--nuttx/configs/twr-k60n512/nsh/defconfig1
-rw-r--r--nuttx/configs/twr-k60n512/ostest/defconfig1
-rw-r--r--nuttx/configs/ubw32/nsh/defconfig2
-rw-r--r--nuttx/configs/us7032evb1/nsh/defconfig2
-rw-r--r--nuttx/configs/us7032evb1/ostest/defconfig2
-rwxr-xr-xnuttx/configs/vsn/nsh/defconfig1
170 files changed, 161 insertions, 186 deletions
diff --git a/nuttx/configs/amber/hello/defconfig b/nuttx/configs/amber/hello/defconfig
index 7e3d4ad70..8bdb55db4 100644
--- a/nuttx/configs/amber/hello/defconfig
+++ b/nuttx/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/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig
index acca1fbac..bd2f3703f 100755
--- a/nuttx/configs/avr32dev1/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig
index 084c66233..72d0c3ae3 100755
--- a/nuttx/configs/avr32dev1/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/c5471evm/httpd/defconfig b/nuttx/configs/c5471evm/httpd/defconfig
index 8f4bd6927..3280b7c16 100644
--- a/nuttx/configs/c5471evm/httpd/defconfig
+++ b/nuttx/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/nuttx/configs/c5471evm/nettest/defconfig b/nuttx/configs/c5471evm/nettest/defconfig
index 71065fc66..131e73f52 100644
--- a/nuttx/configs/c5471evm/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 3750f9e5d..49fc8f9d0 100644
--- a/nuttx/configs/c5471evm/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/c5471evm/ostest/defconfig b/nuttx/configs/c5471evm/ostest/defconfig
index f4d7b8c36..13013a2bd 100644
--- a/nuttx/configs/c5471evm/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/compal_e88/nsh_highram/defconfig b/nuttx/configs/compal_e88/nsh_highram/defconfig
index d67674f4e..a6868e869 100644
--- a/nuttx/configs/compal_e88/nsh_highram/defconfig
+++ b/nuttx/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/nuttx/configs/compal_e99/nsh_compalram/defconfig b/nuttx/configs/compal_e99/nsh_compalram/defconfig
index e8c53947b..058dc2aa2 100644
--- a/nuttx/configs/compal_e99/nsh_compalram/defconfig
+++ b/nuttx/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/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig
index 1d405874e..ee1405ca5 100644
--- a/nuttx/configs/compal_e99/nsh_highram/defconfig
+++ b/nuttx/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/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig
index 79224989f..3222b63ee 100755
--- a/nuttx/configs/demo9s12ne64/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index 8c7b351af..43510fa59 100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig
index 19838ceab..6da813d9e 100644
--- a/nuttx/configs/ea3131/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig
index 1cc2bec7e..2a9eeff93 100644
--- a/nuttx/configs/ea3131/pgnsh/defconfig
+++ b/nuttx/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/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig
index a82f69877..40c0897f7 100644
--- a/nuttx/configs/ea3131/usbserial/defconfig
+++ b/nuttx/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/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig
index a957fb3ab..0659383a6 100644
--- a/nuttx/configs/ea3131/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/ea3152/ostest/defconfig b/nuttx/configs/ea3152/ostest/defconfig
index 6d0bb63f0..d4d978649 100644
--- a/nuttx/configs/ea3152/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig
index bd0ac7664..bb6636445 100644
--- a/nuttx/configs/eagle100/httpd/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig
index 9b1f616c6..8f969ee79 100644
--- a/nuttx/configs/eagle100/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index 079bbc60e..ed1c7b074 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig
index 110f906cb..590a30516 100644
--- a/nuttx/configs/eagle100/nxflat/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index 6d3b4ddad..229aec59c 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig
index 2aca2582e..7e1282368 100644
--- a/nuttx/configs/eagle100/thttpd/defconfig
+++ b/nuttx/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/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
index adb9bb5fa..0bf59edf4 100644
--- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/ekk-lm3s9b96/ostest/defconfig b/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
index 821502036..3ac3c066a 100644
--- a/nuttx/configs/ekk-lm3s9b96/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index 80c9e682e..d86177828 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 95baadc13..043526165 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig
index 6a910ee0b..329b97053 100644
--- a/nuttx/configs/ez80f910200zco/httpd/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig
index 22cf35a0c..94eedae20 100644
--- a/nuttx/configs/ez80f910200zco/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index 8ad3930ff..7b8f12a41 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig
index 88c1b7279..e414cfcc1 100644
--- a/nuttx/configs/ez80f910200zco/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig
index 82cea4fcf..23c9fe747 100644
--- a/nuttx/configs/ez80f910200zco/poll/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig
index e90ded32a..fc258df0c 100644
--- a/nuttx/configs/hymini-stm32v/buttons/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig
index eeb3b09ff..5736aadc8 100755
--- a/nuttx/configs/hymini-stm32v/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig
index ecf4c3a3d..7183a8632 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/nx/defconfig b/nuttx/configs/hymini-stm32v/nx/defconfig
index c6e049142..4e522cfd8 100644
--- a/nuttx/configs/hymini-stm32v/nx/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/nxlines/defconfig b/nuttx/configs/hymini-stm32v/nxlines/defconfig
index fb968c483..7d1e8b975 100644
--- a/nuttx/configs/hymini-stm32v/nxlines/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/usbserial/defconfig b/nuttx/configs/hymini-stm32v/usbserial/defconfig
index 0c7317a00..b53a79dd8 100755
--- a/nuttx/configs/hymini-stm32v/usbserial/defconfig
+++ b/nuttx/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/nuttx/configs/hymini-stm32v/usbstorage/defconfig b/nuttx/configs/hymini-stm32v/usbstorage/defconfig
index 16f43a1ce..d89a33a03 100755
--- a/nuttx/configs/hymini-stm32v/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig
index ff8c39c1f..826af71b8 100755
--- a/nuttx/configs/kwikstik-k40/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lincoln60/nsh/defconfig b/nuttx/configs/lincoln60/nsh/defconfig
index 908b01e3a..abdea0c86 100644
--- a/nuttx/configs/lincoln60/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lincoln60/ostest/defconfig b/nuttx/configs/lincoln60/ostest/defconfig
index ea42f5763..8ab244f0d 100644
--- a/nuttx/configs/lincoln60/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index a09bc6717..cb3bbdeb4 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6432-s2e/ostest/defconfig b/nuttx/configs/lm3s6432-s2e/ostest/defconfig
index 9387fd086..a3ec72422 100644
--- a/nuttx/configs/lm3s6432-s2e/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index 5c288f95d..ccda5d9e8 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index 67633c916..7a1b0eb0a 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 4a35f8d4a..f49b977aa 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 3ca6ade21..b92bd8e95 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/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/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index 169ac9c8f..cdf0477bc 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index 78b9e3f71..99c920078 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lpc4330-xplorer/ostest/defconfig b/nuttx/configs/lpc4330-xplorer/ostest/defconfig
index 342fe04a0..fc853de17 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 2e0d2eea6..824fcfb2c 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index 23f375a47..c11cf623f 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
index 3f8474103..d4b3b8953 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig b/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
index 10b63eb2d..831b717b9 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
index b6ea25948..299750371 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/nuttx/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/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig b/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
index 9e4bcb15d..fd055ee02 100755
--- a/nuttx/configs/lpcxpresso-lpc1768/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig
index 4c4020184..7e49073a9 100644
--- a/nuttx/configs/m68332evb/defconfig
+++ b/nuttx/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/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig
index b4bf00872..94b007355 100644
--- a/nuttx/configs/mbed/hidkbd/defconfig
+++ b/nuttx/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/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig
index 2156af80e..40a230b52 100755
--- a/nuttx/configs/mbed/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/composite/defconfig b/nuttx/configs/mcu123-lpc214x/composite/defconfig
index 04fbe2b9e..682facbab 100644
--- a/nuttx/configs/mcu123-lpc214x/composite/defconfig
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index 9d59439be..7d0c50157 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 3097f7d78..c9f528c37 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index 7b22bf6b0..4273315c6 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/micropendous3/hello/defconfig b/nuttx/configs/micropendous3/hello/defconfig
index ebc755abc..2708c5d52 100644
--- a/nuttx/configs/micropendous3/hello/defconfig
+++ b/nuttx/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/nuttx/configs/mirtoo/nsh/defconfig b/nuttx/configs/mirtoo/nsh/defconfig
index 6e0d3bf70..9beaf6728 100644
--- a/nuttx/configs/mirtoo/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/mirtoo/nxffs/defconfig b/nuttx/configs/mirtoo/nxffs/defconfig
index ed50e0325..50929eb0e 100644
--- a/nuttx/configs/mirtoo/nxffs/defconfig
+++ b/nuttx/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/nuttx/configs/mirtoo/ostest/defconfig b/nuttx/configs/mirtoo/ostest/defconfig
index 5c8b69785..7c8596dbf 100644
--- a/nuttx/configs/mirtoo/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig
index 54dbf6cce..d432b8469 100644
--- a/nuttx/configs/mx1ads/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig
index e6e0df700..a730c93eb 100755
--- a/nuttx/configs/ne64badge/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig
index dd2aff53c..ee70127e3 100644
--- a/nuttx/configs/ntosd-dm320/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index 98de53fe0..83f0dde79 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig
index 5d606453b..94a946db3 100644
--- a/nuttx/configs/ntosd-dm320/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig
index e43eccce5..d80868883 100644
--- a/nuttx/configs/ntosd-dm320/poll/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig
index fbb6d644f..632e9a16e 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index 5859279d0..3d79e75ac 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/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/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig
index 69387e7f6..6e08a3702 100644
--- a/nuttx/configs/ntosd-dm320/uip/defconfig
+++ b/nuttx/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/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig
index 2c440bc7f..8f3e50971 100755
--- a/nuttx/configs/nucleus2g/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig
index c32b1e715..8f6cc8ac1 100755
--- a/nuttx/configs/nucleus2g/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig
index abe9ac020..edd2160b4 100755
--- a/nuttx/configs/nucleus2g/usbserial/defconfig
+++ b/nuttx/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/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig
index adab8f4f0..8ea4614be 100755
--- a/nuttx/configs/nucleus2g/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
index 8ff0d95aa..15b26899b 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
index 634601187..fce1ed26f 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
index 4ab823b8c..5b6b3d676 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index 096f08a8a..8ed82a3ed 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig
index 28ad229d6..f27acf40e 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
index 02732e74a..f341a49c4 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 9becdee04..259457cf6 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
index fe42a861f..f684dcde3 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
index 995cbad59..122e61485 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
index e11c2c404..51743e020 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig
index fcddbaaca..c6728adb7 100755
--- a/nuttx/configs/olimex-lpc2378/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig
index b7216c7c4..01e1918fd 100755
--- a/nuttx/configs/olimex-lpc2378/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
index 0a831ce9f..09d447e14 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-stm32-p107/ostest/defconfig b/nuttx/configs/olimex-stm32-p107/ostest/defconfig
index 272832381..6bc065784 100644
--- a/nuttx/configs/olimex-stm32-p107/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig
index a8767c7be..bc95f0c02 100755
--- a/nuttx/configs/olimex-strp711/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig
index b621945ed..886498eae 100644
--- a/nuttx/configs/olimex-strp711/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig
index 02804cd67..b5621315a 100644
--- a/nuttx/configs/olimex-strp711/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
index 6f1ef7dc9..fe24cb886 100644
--- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/pcblogic-pic32mx/ostest/defconfig b/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
index 1df428f8a..19196eae9 100644
--- a/nuttx/configs/pcblogic-pic32mx/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/pic32-starterkit/nsh/defconfig b/nuttx/configs/pic32-starterkit/nsh/defconfig
index f1c543e5f..8bf0432e2 100644
--- a/nuttx/configs/pic32-starterkit/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index f681b7689..fb54a2949 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/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/nuttx/configs/pic32-starterkit/ostest/defconfig b/nuttx/configs/pic32-starterkit/ostest/defconfig
index 6a077f209..39f7d04af 100644
--- a/nuttx/configs/pic32-starterkit/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index 66cd240e2..62f524ee2 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/pic32mx7mmb/ostest/defconfig b/nuttx/configs/pic32mx7mmb/ostest/defconfig
index 7cb71995e..4595913cd 100644
--- a/nuttx/configs/pic32mx7mmb/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig
index b41d74e31..43c2347a9 100644
--- a/nuttx/configs/pjrc-8051/defconfig
+++ b/nuttx/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/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index 792157fe0..09e252e0b 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index b0036289a..aeae97df1 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/rgmp/arm/default/defconfig b/nuttx/configs/rgmp/arm/default/defconfig
index 0c40e8bd2..88843e365 100644
--- a/nuttx/configs/rgmp/arm/default/defconfig
+++ b/nuttx/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/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig
index 0ae14b141..47c685aae 100644
--- a/nuttx/configs/rgmp/arm/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/rgmp/x86/cxxtest/defconfig b/nuttx/configs/rgmp/x86/cxxtest/defconfig
index 1d2996557..b1634e1e5 100644
--- a/nuttx/configs/rgmp/x86/cxxtest/defconfig
+++ b/nuttx/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/nuttx/configs/rgmp/x86/default/defconfig b/nuttx/configs/rgmp/x86/default/defconfig
index 070ffcb30..383e0ff5f 100644
--- a/nuttx/configs/rgmp/x86/default/defconfig
+++ b/nuttx/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/nuttx/configs/rgmp/x86/helloxx/defconfig b/nuttx/configs/rgmp/x86/helloxx/defconfig
index c8400560a..159195224 100644
--- a/nuttx/configs/rgmp/x86/helloxx/defconfig
+++ b/nuttx/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/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig
index 891d58ba8..6f10b234a 100644
--- a/nuttx/configs/rgmp/x86/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/sam3u-ek/knsh/defconfig b/nuttx/configs/sam3u-ek/knsh/defconfig
index 30f60f0e3..709c3e785 100755
--- a/nuttx/configs/sam3u-ek/knsh/defconfig
+++ b/nuttx/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/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig
index 971598464..38520a9aa 100755
--- a/nuttx/configs/sam3u-ek/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index dd55d9c93..a21a6570d 100755
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/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/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig
index bf15cb1a5..5125f5ba9 100755
--- a/nuttx/configs/sam3u-ek/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/sam3u-ek/touchscreen/defconfig b/nuttx/configs/sam3u-ek/touchscreen/defconfig
index 414eadb6e..278c55478 100755
--- a/nuttx/configs/sam3u-ek/touchscreen/defconfig
+++ b/nuttx/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/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig
index d5e108782..7caa87852 100644
--- a/nuttx/configs/sim/mount/defconfig
+++ b/nuttx/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/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig
index 1df980ea8..c216e2edc 100644
--- a/nuttx/configs/sim/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig
index 2d627a66d..794b3107d 100644
--- a/nuttx/configs/sim/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig
index c9e5b343f..b7e31b9e3 100644
--- a/nuttx/configs/sim/nsh2/defconfig
+++ b/nuttx/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/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig
index 714d5dbb6..0fddca096 100644
--- a/nuttx/configs/sim/nx/defconfig
+++ b/nuttx/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/nuttx/configs/sim/nxffs/defconfig b/nuttx/configs/sim/nxffs/defconfig
index c8aadee25..79f5b0f93 100644
--- a/nuttx/configs/sim/nxffs/defconfig
+++ b/nuttx/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/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig
index fedf401d8..b40ec626e 100644
--- a/nuttx/configs/sim/pashello/defconfig
+++ b/nuttx/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/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig
index df2a0553c..6a2e3e304 100644
--- a/nuttx/configs/sim/touchscreen/defconfig
+++ b/nuttx/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/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig
index cf93d5b10..40ff5b3a1 100644
--- a/nuttx/configs/skp16c26/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig
index 6d84e7c36..662537a9d 100755
--- a/nuttx/configs/stm3210e-eval/RIDE/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/buttons/defconfig b/nuttx/configs/stm3210e-eval/buttons/defconfig
index 37e19171f..3c8fca222 100644
--- a/nuttx/configs/stm3210e-eval/buttons/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/composite/defconfig b/nuttx/configs/stm3210e-eval/composite/defconfig
index 7fee33794..b5c39f928 100755
--- a/nuttx/configs/stm3210e-eval/composite/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig
index b5e52e494..12ebc34c2 100755
--- a/nuttx/configs/stm3210e-eval/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index 30a0bb327..063307143 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index 0ad42dfbe..bff031617 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
index 7dd5878bf..94dbf500f 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig
index 068a17acb..760b3a6e1 100644
--- a/nuttx/configs/stm3210e-eval/nxlines/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index b6f88a3ca..d8b1fbe1e 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig
index 0553b1a98..eb14399ea 100755
--- a/nuttx/configs/stm3210e-eval/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index 61bd995c8..c113ddf60 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig
index 94059c07c..c1f935e96 100755
--- a/nuttx/configs/stm3210e-eval/usbserial/defconfig
+++ b/nuttx/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/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig
index 5c1ed5fb2..3e7119353 100755
--- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
index 29baf9af0..627136ebb 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/nettest/defconfig b/nuttx/configs/stm3220g-eval/nettest/defconfig
index 08e04ad0e..39c1bb8ed 100644
--- a/nuttx/configs/stm3220g-eval/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig
index bd9d02860..8486c4fd6 100644
--- a/nuttx/configs/stm3220g-eval/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index b5fe843bc..bc641b8be 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/ostest/defconfig b/nuttx/configs/stm3220g-eval/ostest/defconfig
index f63f96c9a..3ec417516 100644
--- a/nuttx/configs/stm3220g-eval/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/stm3220g-eval/telnetd/defconfig b/nuttx/configs/stm3220g-eval/telnetd/defconfig
index f529198f1..b89e7d4f7 100644
--- a/nuttx/configs/stm3220g-eval/telnetd/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
index 5199cf85c..91682111b 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/nettest/defconfig b/nuttx/configs/stm3240g-eval/nettest/defconfig
index c5e0da795..257a4d252 100644
--- a/nuttx/configs/stm3240g-eval/nettest/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index 6c19ed531..82caf1622 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig
index 08690ade3..9e7d57ade 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
index 202fa4378..92c3ceb75 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index a220af2d1..34eaa9ec6 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/ostest/defconfig b/nuttx/configs/stm3240g-eval/ostest/defconfig
index fcc54aa4b..f9e690a10 100644
--- a/nuttx/configs/stm3240g-eval/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/telnetd/defconfig b/nuttx/configs/stm3240g-eval/telnetd/defconfig
index 5aef41c27..ec04476b7 100644
--- a/nuttx/configs/stm3240g-eval/telnetd/defconfig
+++ b/nuttx/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/nuttx/configs/stm3240g-eval/webserver/defconfig b/nuttx/configs/stm3240g-eval/webserver/defconfig
index 6d09968e9..792eafa0a 100644
--- a/nuttx/configs/stm3240g-eval/webserver/defconfig
+++ b/nuttx/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/nuttx/configs/stm32f4discovery/nsh/defconfig b/nuttx/configs/stm32f4discovery/nsh/defconfig
index 98034e22e..d9917b3a8 100644
--- a/nuttx/configs/stm32f4discovery/nsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/nsh/defconfig
@@ -377,14 +377,6 @@ 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
#
CONFIG_MMCSD_NSLOTS=0
diff --git a/nuttx/configs/stm32f4discovery/pm/defconfig b/nuttx/configs/stm32f4discovery/pm/defconfig
index 3e24168cd..1636f6ecb 100644
--- a/nuttx/configs/stm32f4discovery/pm/defconfig
+++ b/nuttx/configs/stm32f4discovery/pm/defconfig
@@ -396,14 +396,6 @@ 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
#
CONFIG_MMCSD_NSLOTS=0
diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig
index 07b31a1ae..d15bac1f4 100644
--- a/nuttx/configs/sure-pic32mx/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/sure-pic32mx/ostest/defconfig b/nuttx/configs/sure-pic32mx/ostest/defconfig
index 86bb3b307..a04f2171a 100644
--- a/nuttx/configs/sure-pic32mx/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
index 9f6046f21..3ebfde834 100644
--- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig
+++ b/nuttx/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/nuttx/configs/teensy/hello/defconfig b/nuttx/configs/teensy/hello/defconfig
index 8fafe1a10..cc2b6c9c1 100644
--- a/nuttx/configs/teensy/hello/defconfig
+++ b/nuttx/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/nuttx/configs/teensy/nsh/defconfig b/nuttx/configs/teensy/nsh/defconfig
index faeb0b103..0cc877731 100755
--- a/nuttx/configs/teensy/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/teensy/usbstorage/defconfig b/nuttx/configs/teensy/usbstorage/defconfig
index 1f0186897..590a6f8bb 100755
--- a/nuttx/configs/teensy/usbstorage/defconfig
+++ b/nuttx/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/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig
index 3f272b55a..959379bea 100644
--- a/nuttx/configs/twr-k60n512/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig
index fd27ffc2b..14d3435da 100644
--- a/nuttx/configs/twr-k60n512/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/ubw32/nsh/defconfig b/nuttx/configs/ubw32/nsh/defconfig
index 89afd5912..8769fa677 100644
--- a/nuttx/configs/ubw32/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig
index 2405dc2d3..5bf0bd71d 100644
--- a/nuttx/configs/us7032evb1/nsh/defconfig
+++ b/nuttx/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/nuttx/configs/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig
index e910f112f..5b40baf88 100644
--- a/nuttx/configs/us7032evb1/ostest/defconfig
+++ b/nuttx/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/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig
index 2b7d8a20c..5952f4724 100755
--- a/nuttx/configs/vsn/nsh/defconfig
+++ b/nuttx/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