fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-18 15:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

px4fmu-v4 Refreshed nuttx SDIO changes for 7.19+

Browse Source
This commit is contained in:
David Sidrane 2017-01-31 11:10:02 -10:00 committed by Daniel Agar
parent 0a25cc2254
commit 63b9c03e53
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nuttx-configs/px4fmu-v4/include/board.h
View File

@ -179,7 +179,7 @@
* DMA OFF: SDIOCLK=48MHz, SDIO_CK=SDIOCLK/(2+2)=12 MHz
*/
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_STM32_SDIO_DMA
# define SDIO_MMCXFR_CLKDIV (1 << SDIO_CLKCR_CLKDIV_SHIFT)
#else
# define SDIO_MMCXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT)
@ -189,7 +189,7 @@
* DMA OFF: SDIOCLK=48MHz, SDIO_CK=SDIOCLK/(2+2)=12 MHz
*/
#ifdef CONFIG_SDIO_DMA
#ifdef CONFIG_STM32_SDIO_DMA
# define SDIO_SDXFR_CLKDIV (1 << SDIO_CLKCR_CLKDIV_SHIFT)
#else
# define SDIO_SDXFR_CLKDIV (2 << SDIO_CLKCR_CLKDIV_SHIFT)

8
nuttx-configs/px4fmu-v4/nsh/defconfig
View File

@ -151,8 +151,6 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
# CONFIG_ARMV7M_STACKCHECK is not set
# CONFIG_ARMV7M_ITMSYSLOG is not set
CONFIG_SERIAL_TERMIOS=y
CONFIG_SDIO_DMA=y
# CONFIG_SDIO_WIDTH_D1_ONLY is not set
#
# STM32 Configuration Options
@ -549,7 +547,9 @@ CONFIG_STM32_I2CTIMEOTICKS=10
#
# SDIO Configuration
#
CONFIG_SDIO_DMAPRIO=0x00010000
CONFIG_STM32_SDIO_DMA=y
CONFIG_STM32_SDIO_DMAPRIO=0x00010000
# CONFIG_STM32_SDIO_WIDTH_D1_ONLY is not set
CONFIG_STM32_BBSRAM=y
CONFIG_STM32_BBSRAM_FILES=5
CONFIG_STM32_SAVE_CRASHDUMP=y
@ -874,11 +874,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