aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4io-v2/nsh/defconfig
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-05-07 10:21:21 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-05-07 10:21:21 +0200
commitcd95fce612a41f61aec0a8196786cc9ee7cfabf5 (patch)
treec0760ed5b23fa82744025a7ffa6a4c4a262fddb5 /nuttx-configs/px4io-v2/nsh/defconfig
parentf20a9c48732b578acd7164ae5c513c657092ab91 (diff)
parent6c1a035d6b0299479e955df82032407ceafb9790 (diff)
downloadpx4-firmware-cd95fce612a41f61aec0a8196786cc9ee7cfabf5.tar.gz
px4-firmware-cd95fce612a41f61aec0a8196786cc9ee7cfabf5.tar.bz2
px4-firmware-cd95fce612a41f61aec0a8196786cc9ee7cfabf5.zip
Merge branch 'master' of github.com:PX4/Firmware into mtecs
Diffstat (limited to 'nuttx-configs/px4io-v2/nsh/defconfig')
-rwxr-xr-xnuttx-configs/px4io-v2/nsh/defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/nuttx-configs/px4io-v2/nsh/defconfig b/nuttx-configs/px4io-v2/nsh/defconfig
index 4111e70eb..e6563e587 100755
--- a/nuttx-configs/px4io-v2/nsh/defconfig
+++ b/nuttx-configs/px4io-v2/nsh/defconfig
@@ -104,9 +104,9 @@ CONFIG_ARMV7M_CMNVECTOR=y
# CONFIG_STM32_JTAG_SW_ENABLE - Set JTAG-DP disabled and SW-DP enabled
#
CONFIG_STM32_DFU=n
-CONFIG_STM32_JTAG_FULL_ENABLE=y
+CONFIG_STM32_JTAG_FULL_ENABLE=n
CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n
-CONFIG_STM32_JTAG_SW_ENABLE=n
+CONFIG_STM32_JTAG_SW_ENABLE=y
#
# Individual subsystems can be enabled: