aboutsummaryrefslogtreecommitdiff
path: root/nuttx-configs/px4io-v2/nsh/defconfig
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-05-20 00:03:00 +0200
committerAnton Babushkin <anton.babushkin@me.com>2014-05-20 00:03:00 +0200
commitb12928548c8254ce305f0d96c1b1007b42005be4 (patch)
tree48ee722bdcddb4204b729bb01ea49942e4fcddd5 /nuttx-configs/px4io-v2/nsh/defconfig
parentb165e6ba2000f89b1220393e469911f3e3a73286 (diff)
parentb250e28abfaf4d1adc8bdfb815fff369e0e41cc6 (diff)
downloadpx4-firmware-b12928548c8254ce305f0d96c1b1007b42005be4.tar.gz
px4-firmware-b12928548c8254ce305f0d96c1b1007b42005be4.tar.bz2
px4-firmware-b12928548c8254ce305f0d96c1b1007b42005be4.zip
Merge branch 'master' into acro2
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: