diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-01 11:06:47 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-01 11:06:47 +0100 |
| commit | 84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9 (patch) | |
| tree | db0470a2471776e9ffe525b2fa7302cec7ab8bd8 /nuttx-configs/px4fmu-v1/nsh/defconfig | |
| parent | 7c958a2cca90a6262dc491fe9ef86d85bacdf3da (diff) | |
| parent | a2a244584e36a0e9ffdb93a0dda8473baf8344d3 (diff) | |
| download | px4-firmware-84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9.tar.gz px4-firmware-84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9.tar.bz2 px4-firmware-84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9.zip | |
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge2_attctrl_posctrl
Conflicts:
src/drivers/px4fmu/fmu.cpp
Diffstat (limited to 'nuttx-configs/px4fmu-v1/nsh/defconfig')
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index a467fa605..539634e3d 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -92,7 +92,7 @@ CONFIG_ARCH_HAVE_MPU=y # # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y -CONFIG_ARMV7M_STACKCHECK=y +CONFIG_ARMV7M_STACKCHECK=n CONFIG_SERIAL_TERMIOS=y # |