From db8edd106965f17e761cc66f9dcce0a794d19d7b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 18 Oct 2013 08:57:59 -0600 Subject: [PATCH] Make sure that CONFIG_SDIO_PEFLIGHT=y is set in all STM32 configurations that have SDIO DMA enabled --- configs/fire-stm32v2/nsh/defconfig | 1 + configs/hymini-stm32v/nsh/defconfig | 1 + configs/hymini-stm32v/nsh2/defconfig | 1 + configs/hymini-stm32v/usbmsc/defconfig | 1 + configs/stm3210e-eval/composite/defconfig | 1 + configs/stm3210e-eval/nsh/defconfig | 1 + configs/stm3210e-eval/nsh2/defconfig | 1 + configs/stm3210e-eval/nx/defconfig | 1 + configs/stm3210e-eval/nxconsole/defconfig | 1 + configs/stm3210e-eval/nxlines/defconfig | 1 + configs/stm3210e-eval/nxtext/defconfig | 1 + configs/stm3210e-eval/usbmsc/defconfig | 1 + configs/stm3220g-eval/nsh2/defconfig | 1 + configs/stm3240g-eval/nsh2/defconfig | 1 + 14 files changed, 14 insertions(+) diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index 44a012235b..09d558024b 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/configs/fire-stm32v2/nsh/defconfig @@ -184,6 +184,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500 # SDIO Configuration # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_SDIO_PRI=128 CONFIG_SDIO_DMAPRIO=0x00001000 # CONFIG_SDIO_WIDTH_D1_ONLY is not set diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig index 5f17640c78..fcbb6be4fd 100755 --- a/configs/hymini-stm32v/nsh/defconfig +++ b/configs/hymini-stm32v/nsh/defconfig @@ -94,6 +94,7 @@ CONFIG_ARCH_HAVE_MPU=y CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y # CONFIG_SERIAL_TERMIOS is not set CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_SDIO_DMAPRIO=0x00001000 # CONFIG_SDIO_WIDTH_D1_ONLY is not set diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig index 096662f40f..0fbf2cfc4b 100644 --- a/configs/hymini-stm32v/nsh2/defconfig +++ b/configs/hymini-stm32v/nsh2/defconfig @@ -94,6 +94,7 @@ CONFIG_ARCH_HAVE_MPU=y CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y # CONFIG_SERIAL_TERMIOS is not set CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_SDIO_DMAPRIO=0x00001000 # CONFIG_SDIO_WIDTH_D1_ONLY is not set diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig index 2a1aa3ae69..f1ae6d9b37 100755 --- a/configs/hymini-stm32v/usbmsc/defconfig +++ b/configs/hymini-stm32v/usbmsc/defconfig @@ -303,6 +303,7 @@ CONFIG_FS_WRITEBUFFER=n # SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_HAVECARDDETECT=n diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig index 71ca05bc3d..43f278eb91 100755 --- a/configs/stm3210e-eval/composite/defconfig +++ b/configs/stm3210e-eval/composite/defconfig @@ -112,6 +112,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set # CONFIG_SERIAL_TERMIOS is not set CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_SDIO_DMAPRIO=0x00001000 # CONFIG_SDIO_WIDTH_D1_ONLY is not set diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig index fa4616672b..179a80be4c 100755 --- a/configs/stm3210e-eval/nsh/defconfig +++ b/configs/stm3210e-eval/nsh/defconfig @@ -309,6 +309,7 @@ CONFIG_FS_WRITEBUFFER=n # STM32 SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y #CONFIG_SDIO_PRI=128 #CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_WIDTH_D1_ONLY diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index c2e6ce6030..20b2568111 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -374,6 +374,7 @@ CONFIG_FS_WRITEBUFFER=n # STM32 SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y #CONFIG_SDIO_PRI=128 #CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_WIDTH_D1_ONLY diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index 8f7b2c7271..0a299aa5f4 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -326,6 +326,7 @@ CONFIG_FS_WRITEBUFFER=n # SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_HAVECARDDETECT=n diff --git a/configs/stm3210e-eval/nxconsole/defconfig b/configs/stm3210e-eval/nxconsole/defconfig index 8cbe639643..ff3b03a9c9 100644 --- a/configs/stm3210e-eval/nxconsole/defconfig +++ b/configs/stm3210e-eval/nxconsole/defconfig @@ -327,6 +327,7 @@ CONFIG_FS_WRITEBUFFER=n # SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_HAVECARDDETECT=n diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig index f954b3c061..edfa6c0372 100644 --- a/configs/stm3210e-eval/nxlines/defconfig +++ b/configs/stm3210e-eval/nxlines/defconfig @@ -326,6 +326,7 @@ CONFIG_FS_WRITEBUFFER=n # SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_HAVECARDDETECT=n diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index 9292f331ef..5ff22085c2 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -326,6 +326,7 @@ CONFIG_FS_WRITEBUFFER=n # SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_HAVECARDDETECT=n diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig index faef419fcb..948db29a94 100755 --- a/configs/stm3210e-eval/usbmsc/defconfig +++ b/configs/stm3210e-eval/usbmsc/defconfig @@ -318,6 +318,7 @@ CONFIG_FS_WRITEBUFFER=n # SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y CONFIG_MMCSD_MMCSUPPORT=n CONFIG_MMCSD_HAVECARDDETECT=n diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig index 7b15734634..459f8c4266 100644 --- a/configs/stm3220g-eval/nsh2/defconfig +++ b/configs/stm3220g-eval/nsh2/defconfig @@ -427,6 +427,7 @@ CONFIG_FS_WRITEBUFFER=n # STM32 SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y #CONFIG_SDIO_PRI=128 #CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_WIDTH_D1_ONLY diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig index c5d33c42df..11238d3119 100644 --- a/configs/stm3240g-eval/nsh2/defconfig +++ b/configs/stm3240g-eval/nsh2/defconfig @@ -433,6 +433,7 @@ CONFIG_FS_WRITEBUFFER=n # STM32 SDIO-based MMC/SD driver # CONFIG_SDIO_DMA=y +CONFIG_SDIO_PREFLIGHT=y #CONFIG_SDIO_PRI=128 #CONFIG_SDIO_DMAPRIO #CONFIG_SDIO_WIDTH_D1_ONLY