diff options
| author | px4dev <px4@purgatory.org> | 2013-04-22 22:56:18 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-04-22 22:56:18 -0700 |
| commit | 8fcbb4f669d8c9003f778f35a94278383e0360ac (patch) | |
| tree | 368631fd8038b3091b60293f725efd193587aae0 /nuttx | |
| parent | f45e15615a55f8c6070c2598aa10b1dc8ea971b1 (diff) | |
| download | px4-firmware-8fcbb4f669d8c9003f778f35a94278383e0360ac.tar.gz px4-firmware-8fcbb4f669d8c9003f778f35a94278383e0360ac.tar.bz2 px4-firmware-8fcbb4f669d8c9003f778f35a94278383e0360ac.zip | |
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.
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c | 2 | ||||
| -rwxr-xr-x | nuttx/configs/px4fmuv2/nsh/defconfig | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c b/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c index 40fce8cb5..5140ee4f9 100644 --- a/nuttx/arch/arm/src/stm32/stm32f40xxx_dma.c +++ b/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, diff --git a/nuttx/configs/px4fmuv2/nsh/defconfig b/nuttx/configs/px4fmuv2/nsh/defconfig index 835998072..307c5079c 100755 --- a/nuttx/configs/px4fmuv2/nsh/defconfig +++ b/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 |