Merge SDIO changes and hack config to make it work.

We need to resolve the DMA-safe memory allocation story, but until then let's disable the CCM. We still have as much RAM as the v1.x boards in this mode.

nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c

@@ -130,7 +130,7 @@ static struct stm32_dma_s g_dma[DMA_NSTREAMS] =
     .stream   = 3,
     .irq      = STM32_IRQ_DMA1S3,
     .shift    = DMA_INT_STREAM3_SHIFT,
-    .base     = STM32_DMA1_BASE + STM32_DMA_OFFSET(4),
+    .base     = STM32_DMA1_BASE + STM32_DMA_OFFSET(3),
   },
   {
     .stream   = 4,

nuttx/configs/px4fmuv2/nsh/defconfig

@@ -118,6 +118,7 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 #   to do this if DMA is enabled to prevent non-DMA-able CCM memory from
 #   being a part of the stack.
 #
+CONFIG_STM32_CCMEXCLUDE=y
 
 #
 # On-board FSMC SRAM configuration
@@ -796,16 +797,16 @@ CONFIG_FS_BINFS=y
 #
 
 CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
+#CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
 
 #
 # SPI-based MMC/SD driver
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+#CONFIG_MMCSD_NSLOTS=1
+#CONFIG_MMCSD_READONLY=n
+#CONFIG_MMCSD_SPICLOCK=12500000
 
 #
 # STM32 SDIO-based MMC/SD driver