Patch to removed MMCSD NSLOTS warning from Freddie Chopin

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5316 42af7a65-404d-4744-a932-0658087f49c3

configs/amber/hello/defconfig

@@ -220,6 +220,14 @@ CONFIG_PREALLOC_TIMERS=0
 CONFIG_FS_FAT=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
 #

configs/avr32dev1/nsh/defconfig

@@ -239,6 +239,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/avr32dev1/ostest/defconfig

@@ -239,6 +239,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/c5471evm/httpd/defconfig

@@ -258,3 +258,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/c5471evm/nettest/defconfig

@@ -258,3 +258,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/c5471evm/nsh/defconfig

@@ -258,3 +258,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/c5471evm/ostest/defconfig

@@ -258,3 +258,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/compal_e88/nsh_highram/defconfig

@@ -277,3 +277,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/compal_e99/nsh_compalram/defconfig

@@ -279,3 +279,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/compal_e99/nsh_highram/defconfig

@@ -323,3 +323,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/demo9s12ne64/ostest/defconfig

@@ -213,6 +213,14 @@ CONFIG_PREALLOC_TIMERS=0
 CONFIG_FS_FAT=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
 #

configs/ea3131/nsh/defconfig

@@ -218,6 +218,14 @@ CONFIG_FS_ROMFS=n
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SDIO-based MMC/SD driver
 #

configs/ea3131/ostest/defconfig

@@ -218,6 +218,14 @@ CONFIG_FS_ROMFS=n
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SDIO-based MMC/SD driver
 #

configs/ea3131/pgnsh/defconfig

@@ -261,6 +261,14 @@ CONFIG_FS_ROMFS=n
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SDIO-based MMC/SD driver
 #

configs/ea3131/usbserial/defconfig

@@ -221,6 +221,14 @@ CONFIG_FS_WRITABLE=y
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SDIO-based MMC/SD driver
 #

configs/ea3131/usbstorage/defconfig

@@ -222,6 +222,14 @@ CONFIG_FS_WRITABLE=y
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SDIO-based MMC/SD driver
 #

configs/ea3152/ostest/defconfig

@@ -219,6 +219,14 @@ CONFIG_FS_ROMFS=n
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SDIO-based MMC/SD driver
 #

configs/eagle100/httpd/defconfig

@@ -213,6 +213,14 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_FS_FAT=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
 #

configs/eagle100/nettest/defconfig

@@ -213,6 +213,14 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_FS_FAT=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
 #

configs/eagle100/nsh/defconfig

@@ -215,6 +215,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/eagle100/nxflat/defconfig

@@ -219,6 +219,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/eagle100/ostest/defconfig

@@ -213,6 +213,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/eagle100/thttpd/defconfig

@@ -220,6 +220,14 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/ekk-lm3s9b96/nsh/defconfig

@@ -232,6 +232,14 @@ CONFIG_FS_FAT=y
 CONFIG_FS_ROMFS=n
 CONFIG_NFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/ekk-lm3s9b96/ostest/defconfig

@@ -231,6 +231,14 @@ CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=n
 CONFIG_NFS=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/ez80f910200kitg/ostest/defconfig

@@ -199,6 +199,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/ez80f910200zco/dhcpd/defconfig

@@ -203,6 +203,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/ez80f910200zco/httpd/defconfig

@@ -203,6 +203,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/ez80f910200zco/nettest/defconfig

@@ -203,6 +203,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/ez80f910200zco/nsh/defconfig

@@ -203,6 +203,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=y
 CONFIG_FS_ROMFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/ez80f910200zco/ostest/defconfig

@@ -201,6 +201,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/ez80f910200zco/poll/defconfig

@@ -203,6 +203,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/hymini-stm32v/buttons/defconfig

@@ -68,7 +68,7 @@ CONFIG_STM32_DFU=n
 #
 # Individual subsystems can be enabled:
 #
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=n
 CONFIG_STM32_CRC=n
@@ -270,6 +270,14 @@ 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
 #

configs/hymini-stm32v/nsh/defconfig

@@ -66,7 +66,7 @@ CONFIG_STM32_DFU=n
 
 #
 # Individual subsystems can be enabled:
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=y
 CONFIG_STM32_CRC=n
@@ -267,6 +267,14 @@ 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
 #

configs/hymini-stm32v/nsh2/defconfig

@@ -67,7 +67,7 @@ CONFIG_STM32_DFU=n
 
 #
 # Individual subsystems can be enabled:
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=y
 CONFIG_STM32_CRC=n
@@ -301,6 +301,14 @@ CONFIG_FS_ROMFS=y
 CONFIG_FS_READAHEAD=n
 CONFIG_FS_WRITEBUFFER=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # STM32 SDIO-based MMC/SD driver
 #

configs/hymini-stm32v/nx/defconfig

@@ -66,7 +66,7 @@ CONFIG_STM32_DFU=n
 
 #
 # Individual subsystems can be enabled:
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=y
 CONFIG_STM32_CRC=n
@@ -284,6 +284,14 @@ 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
 #

configs/hymini-stm32v/nxlines/defconfig

@@ -67,7 +67,7 @@ CONFIG_STM32_DFU=n
 
 #
 # Individual subsystems can be enabled:
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=y
 CONFIG_STM32_CRC=n
@@ -288,6 +288,14 @@ 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
 #

configs/hymini-stm32v/usbserial/defconfig

@@ -68,7 +68,7 @@ CONFIG_STM32_DFU=n
 #
 # Individual subsystems can be enabled:
 #
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=n
 CONFIG_STM32_CRC=n
@@ -270,6 +270,14 @@ 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
 #

configs/hymini-stm32v/usbstorage/defconfig

@@ -67,7 +67,7 @@ CONFIG_STM32_DFU=n
 
 #
 # Individual subsystems can be enabled:
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=y
 CONFIG_STM32_CRC=n
@@ -277,6 +277,14 @@ 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
 #

configs/kwikstik-k40/ostest/defconfig

@@ -279,6 +279,14 @@ 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
 #

configs/lincoln60/nsh/defconfig

@@ -252,6 +252,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/lincoln60/ostest/defconfig

@@ -262,6 +262,14 @@ 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
 #

configs/lm3s6432-s2e/nsh/defconfig

@@ -230,6 +230,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/lm3s6432-s2e/ostest/defconfig

@@ -229,6 +229,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/lm3s6965-ek/nsh/defconfig

@@ -232,6 +232,14 @@ CONFIG_FS_FAT=y
 CONFIG_FS_ROMFS=n
 CONFIG_NFS=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/lm3s6965-ek/nx/defconfig

@@ -245,6 +245,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/lm3s6965-ek/ostest/defconfig

@@ -230,6 +230,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/lm3s8962-ek/nsh/defconfig

@@ -230,6 +230,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/lm3s8962-ek/nx/defconfig

@@ -244,6 +244,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/lm3s8962-ek/ostest/defconfig

@@ -229,6 +229,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/lpc4330-xplorer/nsh/defconfig

@@ -323,6 +323,14 @@ 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
 #

configs/lpc4330-xplorer/ostest/defconfig

@@ -320,6 +320,14 @@ 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
 #

configs/lpcxpresso-lpc1768/dhcpd/defconfig

@@ -264,6 +264,14 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_FS_FAT=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
 #

configs/lpcxpresso-lpc1768/nsh/defconfig

@@ -260,6 +260,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/lpcxpresso-lpc1768/nx/defconfig

@@ -277,6 +277,14 @@ CONFIG_FB_HWCURSORIMAGE=n
 CONFIG_FS_FAT=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
 #

configs/lpcxpresso-lpc1768/ostest/defconfig

@@ -262,6 +262,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/lpcxpresso-lpc1768/thttpd/defconfig

@@ -264,6 +264,14 @@ CONFIG_PREALLOC_TIMERS=8
 CONFIG_FS_FAT=n
 CONFIG_FS_ROMFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/lpcxpresso-lpc1768/usbstorage/defconfig

@@ -258,6 +258,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/m68332evb/defconfig

@@ -209,3 +209,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/mbed/hidkbd/defconfig

@@ -257,6 +257,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/mbed/nsh/defconfig

@@ -252,6 +252,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/mcu123-lpc214x/composite/defconfig

@@ -193,6 +193,14 @@ 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
 #

configs/mcu123-lpc214x/nsh/defconfig

@@ -191,6 +191,14 @@ 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
 #

configs/mcu123-lpc214x/ostest/defconfig

@@ -191,6 +191,14 @@ 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
 #

configs/mcu123-lpc214x/usbserial/defconfig

@@ -191,6 +191,14 @@ 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
 #

configs/mcu123-lpc214x/usbstorage/defconfig

@@ -193,6 +193,14 @@ 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
 #

configs/micropendous3/hello/defconfig

@@ -215,6 +215,14 @@ CONFIG_PREALLOC_TIMERS=0
 CONFIG_FS_FAT=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
 #

configs/mirtoo/nsh/defconfig

@@ -283,6 +283,14 @@ 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
 #

configs/mirtoo/nxffs/defconfig

@@ -283,6 +283,14 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_NXFFS=y
 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
 #

configs/mirtoo/ostest/defconfig

@@ -274,6 +274,14 @@ 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
 #

configs/mx1ads/ostest/defconfig

@@ -321,3 +321,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ne64badge/ostest/defconfig

@@ -55,7 +55,7 @@ CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=n
 
-# 
+#
 CONFIG_GPIO_IRQ=n
 CONFIG_HCS12_PORTG_INTS=n
 CONFIG_HCS12_PORTH_INTS=n
@@ -219,6 +219,14 @@ CONFIG_PREALLOC_TIMERS=0
 CONFIG_FS_FAT=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
 #

configs/ntosd-dm320/nettest/defconfig

@@ -317,3 +317,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ntosd-dm320/nsh/defconfig

@@ -348,3 +348,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ntosd-dm320/ostest/defconfig

@@ -313,3 +313,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ntosd-dm320/poll/defconfig

@@ -324,3 +324,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ntosd-dm320/thttpd/defconfig

@@ -392,3 +392,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ntosd-dm320/udp/defconfig

@@ -325,3 +325,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/ntosd-dm320/uip/defconfig

@@ -325,3 +325,11 @@ CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_HEAP_BASE=
 CONFIG_HEAP_SIZE=
+
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y

configs/nucleus2g/nsh/defconfig

@@ -253,6 +253,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/nucleus2g/ostest/defconfig

@@ -252,6 +252,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/nucleus2g/usbserial/defconfig

@@ -253,6 +253,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/nucleus2g/usbstorage/defconfig

@@ -254,6 +254,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/olimex-lpc1766stk/ftpc/defconfig

@@ -275,6 +275,14 @@ 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
 #

configs/olimex-lpc1766stk/hidkbd/defconfig

@@ -267,6 +267,14 @@ 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
 #

configs/olimex-lpc1766stk/nettest/defconfig

@@ -267,6 +267,14 @@ 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
 #

configs/olimex-lpc1766stk/nsh/defconfig

@@ -279,6 +279,14 @@ 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
 #

configs/olimex-lpc1766stk/nx/defconfig

@@ -280,6 +280,14 @@ 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
 #

configs/olimex-lpc1766stk/ostest/defconfig

@@ -262,6 +262,14 @@ 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
 #

configs/olimex-lpc1766stk/slip-httpd/defconfig

@@ -272,6 +272,14 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/olimex-lpc1766stk/thttpd/defconfig

@@ -270,6 +270,14 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_FS_NXFFS=n
 CONFIG_FS_ROMFS=y
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/olimex-lpc1766stk/usbserial/defconfig

@@ -263,6 +263,14 @@ 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
 #

configs/olimex-lpc1766stk/usbstorage/defconfig

@@ -264,6 +264,14 @@ 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
 #

configs/olimex-lpc1766stk/wlan/defconfig

@@ -259,6 +259,14 @@ 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
 #

configs/olimex-lpc2378/nsh/defconfig

@@ -208,6 +208,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #

configs/olimex-lpc2378/ostest/defconfig

@@ -208,6 +208,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=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
 #

configs/olimex-stm32-p107/nsh/defconfig

@@ -81,7 +81,7 @@ CONFIG_STM32_SPI1_REMAP=n
 CONFIG_STM32_SPI3_REMAP=n
 CONFIG_STM32_I2C1_REMAP=n
 CONFIG_STM32_CAN1_REMAP1=y
-CONFIG_STM32_CAN1_REMAP2=n 
+CONFIG_STM32_CAN1_REMAP2=n
 
 
 #
@@ -309,6 +309,14 @@ 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
 #

configs/olimex-stm32-p107/ostest/defconfig

@@ -90,13 +90,13 @@ CONFIG_STM32_SPI1_REMAP=n
 CONFIG_STM32_SPI3_REMAP=n
 CONFIG_STM32_I2C1_REMAP=n
 CONFIG_STM32_CAN1_REMAP1=y
-CONFIG_STM32_CAN1_REMAP2=n 
+CONFIG_STM32_CAN1_REMAP2=n
 
 
 #
 # Individual subsystems can be enabled:
 #
-# AHB: 
+# AHB:
 CONFIG_STM32_DMA1=n
 CONFIG_STM32_DMA2=n
 CONFIG_STM32_CRC=n
@@ -317,6 +317,14 @@ 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
 #

configs/olimex-strp711/nettest/defconfig

@@ -242,6 +242,14 @@ CONFIG_ENC28J60_NINTERFACES=1
 CONFIG_ENC28J60_STATS=y
 CONFIG_ENC28J60_HALFDUPPLEX=n
 
+#
+# Maintain legacy build behavior (revisit)
+#
+
+CONFIG_MMCSD=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SDIO=y
+
 #
 # SPI-based MMC/SD driver
 #

configs/olimex-strp711/nsh/defconfig

@@ -225,6 +225,14 @@ CONFIG_PREALLOC_TIMERS=4
 CONFIG_FS_FAT=y
 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
 #