diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-28 17:00:23 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-28 17:00:23 +0100 |
| commit | 0b971acf084e03379ff485de4048ded8d6902daf (patch) | |
| tree | 239dafe1704321b5b3a9cd51e08fc2973482021d | |
| parent | 0b9c40e094bb8c7c47990eedf50eb8f1cfc1c96f (diff) | |
| download | px4-firmware-ros_messagelayer_merge_nuttx_bringup_attctrl_posctrl.tar.gz px4-firmware-ros_messagelayer_merge_nuttx_bringup_attctrl_posctrl.tar.bz2 px4-firmware-ros_messagelayer_merge_nuttx_bringup_attctrl_posctrl.zip | |
Revert "temporarily re-enable stack checking, disable some modules to make firmware fit"ros_messagelayer_merge_nuttx_bringup_attctrl_posctrl
This reverts commit 27b2701340648e2fde1992b175abfa591e0eee01.
Conflicts:
nuttx-configs/px4fmu-v2/nsh/defconfig
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 10 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index e741f2271..a48b3115e 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -37,11 +37,11 @@ MODULES += drivers/hott/hott_telemetry MODULES += drivers/hott/hott_sensors MODULES += drivers/blinkm MODULES += drivers/airspeed -# MODULES += drivers/ets_airspeed +MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed -# MODULES += drivers/frsky_telemetry +MODULES += drivers/frsky_telemetry MODULES += modules/sensors -# MODULES += drivers/mkblctrl +MODULES += drivers/mkblctrl MODULES += drivers/px4flow # @@ -70,7 +70,7 @@ MODULES += modules/commander MODULES += modules/navigator MODULES += modules/mavlink MODULES += modules/gpio_led -# MODULES += modules/uavcan +MODULES += modules/uavcan MODULES += modules/land_detector # @@ -120,7 +120,7 @@ MODULES += lib/launchdetection # # OBC challenge # -# MODULES += modules/bottle_drop +MODULES += modules/bottle_drop # # Demo apps diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index d0f198b33..ba39a3125 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -114,7 +114,7 @@ CONFIG_ARCH_FPU=y # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y -CONFIG_ARMV7M_STACKCHECK=y +# CONFIG_ARMV7M_STACKCHECK is not set # CONFIG_ARMV7M_ITMSYSLOG is not set CONFIG_SDIO_DMA=y CONFIG_SDIO_DMAPRIO=0x00010000 |