diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-17 09:05:59 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-17 09:05:59 +0200 |
| commit | d4cd697556f6d09289ea1c896179bd414c48f010 (patch) | |
| tree | d87b1f9e0596e27b8cc89f9d93053204bac70e70 /nuttx/configs | |
| parent | c255df1df9c1cd51e6d0e71ee5f2e92a22eac5cf (diff) | |
| parent | 18d0ea69ca9ccb9147079ef1c729a746b2fe8e36 (diff) | |
| download | px4-nuttx-d4cd697556f6d09289ea1c896179bd414c48f010.tar.gz px4-nuttx-d4cd697556f6d09289ea1c896179bd414c48f010.tar.bz2 px4-nuttx-d4cd697556f6d09289ea1c896179bd414c48f010.zip | |
Merge branch 'integration' of github.com:PX4/NuttX into integration_uart
Diffstat (limited to 'nuttx/configs')
| -rw-r--r-- | nuttx/configs/px4io-v1/Kconfig | 6 | ||||
| -rw-r--r-- | nuttx/configs/px4io-v1/common/Make.defs | 4 | ||||
| -rwxr-xr-x | nuttx/configs/px4io-v1/nsh/defconfig | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/configs/px4io-v1/Kconfig b/nuttx/configs/px4io-v1/Kconfig index 331bbb0da..fbf74d7f0 100644 --- a/nuttx/configs/px4io-v1/Kconfig +++ b/nuttx/configs/px4io-v1/Kconfig @@ -5,16 +5,16 @@ if ARCH_BOARD_PX4IO_V1 -config CONFIG_HRT_TIMER +config HRT_TIMER bool "High resolution timer support" default y ---help--- Enable high resolution timer for PPM capture and system clocks. -config CONFIG_HRT_PPM +config HRT_PPM bool "PPM input capture" default y - depends on CONFIG_HRT_TIMER + depends on HRT_TIMER ---help--- Enable PPM input capture via HRT (for CPPM / PPM sum RC inputs) diff --git a/nuttx/configs/px4io-v1/common/Make.defs b/nuttx/configs/px4io-v1/common/Make.defs index 7f782b5b2..74b183067 100644 --- a/nuttx/configs/px4io-v1/common/Make.defs +++ b/nuttx/configs/px4io-v1/common/Make.defs @@ -63,10 +63,6 @@ ARCHCPUFLAGS = -mcpu=cortex-m3 \ -mthumb \ -march=armv7-m -# enable precise stack overflow tracking -#INSTRUMENTATIONDEFINES = -finstrument-functions \ -# -ffixed-r10 - # use our linker script LDSCRIPT = ld.script diff --git a/nuttx/configs/px4io-v1/nsh/defconfig b/nuttx/configs/px4io-v1/nsh/defconfig index 2168c79b2..525672233 100755 --- a/nuttx/configs/px4io-v1/nsh/defconfig +++ b/nuttx/configs/px4io-v1/nsh/defconfig @@ -94,7 +94,7 @@ CONFIG_ARCH_DMA=y CONFIG_ARCH_MATH_H=y CONFIG_ARMV7M_CMNVECTOR=y -CONFIG_ARMV7M_STACKCHECK=y +# CONFIG_ARMV7M_STACKCHECK is not set # # JTAG Enable settings (by default JTAG-DP and SW-DP are disabled): |