diff options
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/configs/px4fmu-v1/include/board.h | 15 | ||||
| -rwxr-xr-x | nuttx/configs/px4io-v1/nsh/defconfig | 1 |
3 files changed, 11 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index 3b210a833..3b6495857 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -52,7 +52,7 @@ CMN_CSRCS += up_memfault.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c CMN_CSRCS += up_releasepending.c up_releasestack.c up_reprioritizertr.c CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c up_systemreset.c CMN_CSRCS += up_unblocktask.c up_usestack.c up_doirq.c up_hardfault.c -CMN_CSRCS += up_svcall.c up_stackcheck.c up_vfork.c +CMN_CSRCS += up_svcall.c up_vfork.c ifeq ($(CONFIG_ARMV7M_STACKCHECK),y) CMN_CSRCS += up_stackcheck.c diff --git a/nuttx/configs/px4fmu-v1/include/board.h b/nuttx/configs/px4fmu-v1/include/board.h index a0488917c..0fa93a196 100644 --- a/nuttx/configs/px4fmu-v1/include/board.h +++ b/nuttx/configs/px4fmu-v1/include/board.h @@ -310,12 +310,15 @@ #define GPIO_SPI3_SCK GPIO_SPI3_SCK_2 #define GPIO_SPI3_NSS GPIO_SPI3_NSS_2 -/* XXX DMA setup not validated yet */ -//#define DMAMAP_SPI3_RX DMAMAP_SPI3_RX_1 -//#define DMAMAP_SPI3_RX DMAMAP_SPI3_TX_1 - -//#define DMAMAP_SPI1_RX DMAMAP_SPI1_RX_1 -//#define DMAMAP_SPI1_RX DMAMAP_SPI1_TX_1 +/* SPI DMA configuration for SPI3 (microSD) */ +#define DMACHAN_SPI3_RX DMAMAP_SPI3_RX_1 +#define DMACHAN_SPI3_TX DMAMAP_SPI3_TX_2 +/* XXX since we allocate the HP work stack from CCM RAM on normal system startup, + SPI1 will never run in DMA mode - so we can just give it a random config here. + What we really need to do is to make DMA configurable per channel, and always + disable it for SPI1. */ +#define DMACHAN_SPI1_RX DMAMAP_SPI1_RX_1 +#define DMACHAN_SPI1_TX DMAMAP_SPI1_TX_2 /* * Use these in place of the spi_dev_e enumeration to diff --git a/nuttx/configs/px4io-v1/nsh/defconfig b/nuttx/configs/px4io-v1/nsh/defconfig index 3c06a2734..2168c79b2 100755 --- a/nuttx/configs/px4io-v1/nsh/defconfig +++ b/nuttx/configs/px4io-v1/nsh/defconfig @@ -94,6 +94,7 @@ CONFIG_ARCH_DMA=y CONFIG_ARCH_MATH_H=y CONFIG_ARMV7M_CMNVECTOR=y +CONFIG_ARMV7M_STACKCHECK=y # # JTAG Enable settings (by default JTAG-DP and SW-DP are disabled): |