Merge branch 'integration' of github.com:PX4/NuttX into integration_uart

jason914 · Jun 17, 2013 · d4cd697 · d4cd697
2 parents c255df1 + 18d0ea6
commit d4cd697
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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):