Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul

11 years ago · 1089c9516a
6 changed files with 4 additions and 6 deletions
--- a/2
+++ b/2
@ -1 +1 @@
				@@ -1 +1 @@
-Subproject commit 088146b90eee5b614ea6386a64dae343a49a5172
+Subproject commit 41fffa0df192e4a26d2325c7ac5d9b5d7ba0211c
--- a/nuttx-configs/aerocore/nsh/defconfig
+++ b/nuttx-configs/aerocore/nsh/defconfig
@ -314,7 +314,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
				@@ -314,7 +314,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
 CONFIG_ARCH_DMA=y
-CONFIG_ARCH_IRQPRIO=y
+# CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 CONFIG_ARCH_HAVE_VFORK=y
--- a/nuttx-configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v1/nsh/defconfig
@ -309,7 +309,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
				@@ -309,7 +309,7 @@ CONFIG_STM32_I2CTIMEOTICKS=500
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
 CONFIG_ARCH_DMA=y
-CONFIG_ARCH_IRQPRIO=y
+# CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 CONFIG_ARCH_HAVE_VFORK=y
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@ -350,7 +350,7 @@ CONFIG_SDIO_PRI=128
				@@ -350,7 +350,7 @@ CONFIG_SDIO_PRI=128
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
 CONFIG_ARCH_DMA=y
-CONFIG_ARCH_IRQPRIO=y
+# CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 CONFIG_ARCH_HAVE_VFORK=y
--- a/nuttx-configs/px4io-v1/nsh/defconfig
+++ b/nuttx-configs/px4io-v1/nsh/defconfig
@ -83,7 +83,6 @@ CONFIG_ARCH_BOARD="px4io-v1"
				@@ -83,7 +83,6 @@ CONFIG_ARCH_BOARD="px4io-v1"
 CONFIG_BOARD_LOOPSPERMSEC=2000
 CONFIG_DRAM_SIZE=0x00002000
 CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_BOOTLOADER=n
--- a/nuttx-configs/px4io-v2/nsh/defconfig
+++ b/nuttx-configs/px4io-v2/nsh/defconfig
@ -79,7 +79,6 @@ CONFIG_ARCH_BOARD_PX4IO_V2=y
				@@ -79,7 +79,6 @@ CONFIG_ARCH_BOARD_PX4IO_V2=y
 CONFIG_BOARD_LOOPSPERMSEC=2000
 CONFIG_DRAM_SIZE=0x00002000
 CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_BOOTLOADER=n