diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-22 19:24:08 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-22 19:24:08 +0200 |
| commit | c60ee686fa8e12d89055749ef32dd62b8175264d (patch) | |
| tree | cbfe3901249f41fb470a4e440373e3dbe26c4917 | |
| parent | 752a0a562564ccc6f7d49ceebe810de7e6a6d358 (diff) | |
| parent | edffb2eede777f3c316bc8a144984d9d12cbd680 (diff) | |
| download | px4-firmware-c60ee686fa8e12d89055749ef32dd62b8175264d.tar.gz px4-firmware-c60ee686fa8e12d89055749ef32dd62b8175264d.tar.bz2 px4-firmware-c60ee686fa8e12d89055749ef32dd62b8175264d.zip | |
Merge remote-tracking branch 'upstream/master' into obcfailsafe
| m--------- | NuttX | 0 | ||||
| -rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 2 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v1/nsh/defconfig | 1 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v2/nsh/defconfig | 1 |
6 files changed, 3 insertions, 5 deletions
diff --git a/NuttX b/NuttX -Subproject 088146b90eee5b614ea6386a64dae343a49a517 +Subproject 41fffa0df192e4a26d2325c7ac5d9b5d7ba0211 diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index 8d0bae7b9..317194f68 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -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 diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index a651faffa..d7697cd67 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -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 diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index a55c95a29..bd956f7bf 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -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 diff --git a/nuttx-configs/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig index 3785e0367..512c6a0f2 100755 --- a/nuttx-configs/px4io-v1/nsh/defconfig +++ b/nuttx-configs/px4io-v1/nsh/defconfig @@ -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 diff --git a/nuttx-configs/px4io-v2/nsh/defconfig b/nuttx-configs/px4io-v2/nsh/defconfig index e6563e587..02b51e3d7 100755 --- a/nuttx-configs/px4io-v2/nsh/defconfig +++ b/nuttx-configs/px4io-v2/nsh/defconfig @@ -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 |