From f9aa9f29e31c4dbef10fae284861eba3a68da86d Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Tue, 31 Jan 2017 11:10:42 -1000
Subject: [PATCH] px4fmu-v5 Refreshed nuttx SDIO changes for 7.19+

---
 nuttx-configs/px4fmu-v5/include/board.h | 4 ++--
 nuttx-configs/px4fmu-v5/nsh/defconfig   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nuttx-configs/px4fmu-v5/include/board.h b/nuttx-configs/px4fmu-v5/include/board.h
index 53f04ccedd..f7fd33ecf9 100755
--- a/nuttx-configs/px4fmu-v5/include/board.h
+++ b/nuttx-configs/px4fmu-v5/include/board.h
@@ -225,7 +225,7 @@
  * DMA OFF: SDMMCCLK=48MHz, SDMMC_CK=SDMMCCLK/(2+2)=12 MHz
  */
 
-#ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_STM32_SDIO_DMA
 #  define STM32_SDMMC_MMCXFR_CLKDIV     (1 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
 #else
 #  define STM32_SDMMC_MMCXFR_CLKDIV     (2 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
@@ -236,7 +236,7 @@
  */
 //TODO #warning "Check Freq for 24mHz"
 
-#ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_STM32_SDIO_DMA
 #  define STM32_SDMMC_SDXFR_CLKDIV      (1 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
 #else
 #  define STM32_SDMMC_SDXFR_CLKDIV      (2 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
diff --git a/nuttx-configs/px4fmu-v5/nsh/defconfig b/nuttx-configs/px4fmu-v5/nsh/defconfig
index 86d21fc946..55166f3dda 100644
--- a/nuttx-configs/px4fmu-v5/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v5/nsh/defconfig
@@ -393,9 +393,9 @@ CONFIG_STM32F7_SDMMC_DMA=y
 #
 # SDMMC1 Configuration
 #
-CONFIG_SDMMC1_DMA=y
-CONFIG_SDMMC1_DMAPRIO=0x00010000
+CONFIG_STM32F7_SDMMC1_DMAPRIO=0x00010000
 # CONFIG_SDMMC1_WIDTH_D1_ONLY is not set
+# CONFIG_SDMMC2_WIDTH_D1_ONLY is not set
 CONFIG_STM32F7_BBSRAM=y
 CONFIG_STM32F7_BBSRAM_FILES=5
 CONFIG_STM32F7_SAVE_CRASHDUMP=y
@@ -719,11 +719,13 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_HAVECARDDETECT is not set
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH_HAVE_SDIO=y
+CONFIG_SDIO_DMA=y
 CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_SDIO_PREFLIGHT=y
 # CONFIG_SDIO_MUXBUS is not set
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
+# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 # CONFIG_SDIO_BLOCKSETUP is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y