fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-22 01:40:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into obcfailsafe

Browse Source
This commit is contained in:
Thomas Gubler
2014-08-22 19:24:08 +02:00
parent 752a0a5625 edffb2eede
commit c60ee686fa
6 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NuttX
+1 -1
Submodule NuttX updated: 088146b90e...41fffa0df1
nuttx-configs/aerocore/nsh/defconfig
+1 -1
View File
@@ -314,7 +314,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
# CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_IRQPRIO is not set
# CONFIG_CUSTOM_STACK is not set # CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set # CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y
nuttx-configs/px4fmu-v1/nsh/defconfig
+1 -1
View File
@@ -309,7 +309,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
# CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_IRQPRIO is not set
# CONFIG_CUSTOM_STACK is not set # CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set # CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y
nuttx-configs/px4fmu-v2/nsh/defconfig
+1 -1
View File
@@ -350,7 +350,7 @@ CONFIG_SDIO_PRI=128
# CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_NOINTC is not set
# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_VECNOTIRQ is not set
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_IRQPRIO is not set
# CONFIG_CUSTOM_STACK is not set # CONFIG_CUSTOM_STACK is not set
# CONFIG_ADDRENV is not set # CONFIG_ADDRENV is not set
CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_HAVE_VFORK=y
nuttx-configs/px4io-v1/nsh/defconfig
-1
View File
@@ -83,7 +83,6 @@ CONFIG_ARCH_BOARD="px4io-v1"
CONFIG_BOARD_LOOPSPERMSEC=2000 CONFIG_BOARD_LOOPSPERMSEC=2000
CONFIG_DRAM_SIZE=0x00002000 CONFIG_DRAM_SIZE=0x00002000
CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_INTERRUPTSTACK=n
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_BOOTLOADER=n CONFIG_ARCH_BOOTLOADER=n
nuttx-configs/px4io-v2/nsh/defconfig
-1
View File
@@ -79,7 +79,6 @@ CONFIG_ARCH_BOARD_PX4IO_V2=y
CONFIG_BOARD_LOOPSPERMSEC=2000 CONFIG_BOARD_LOOPSPERMSEC=2000
CONFIG_DRAM_SIZE=0x00002000 CONFIG_DRAM_SIZE=0x00002000
CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_START=0x20000000
CONFIG_ARCH_IRQPRIO=y
CONFIG_ARCH_INTERRUPTSTACK=n CONFIG_ARCH_INTERRUPTSTACK=n
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH_BOOTLOADER=n CONFIG_ARCH_BOOTLOADER=n