diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-07 14:28:23 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-07 14:28:23 +0200 |
| commit | de5bdbb8638b1911e9956b49935071349f32ebb7 (patch) | |
| tree | 5fce27d92f17189ffd29da626824b9bce8a27a13 /nuttx-configs | |
| parent | be728d189e4b1b04de5a0b45710e08effcf50b8b (diff) | |
| parent | 2569338919acda9b3bc64f4a02e2014f621980c4 (diff) | |
| download | px4-firmware-de5bdbb8638b1911e9956b49935071349f32ebb7.tar.gz px4-firmware-de5bdbb8638b1911e9956b49935071349f32ebb7.tar.bz2 px4-firmware-de5bdbb8638b1911e9956b49935071349f32ebb7.zip | |
Merged master into uavcan
Diffstat (limited to 'nuttx-configs')
| -rwxr-xr-x | nuttx-configs/px4io-v2/include/board.h | 2 | ||||
| -rwxr-xr-x | nuttx-configs/px4io-v2/nsh/defconfig | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nuttx-configs/px4io-v2/include/board.h b/nuttx-configs/px4io-v2/include/board.h index 4b9c90638..17e77918b 100755 --- a/nuttx-configs/px4io-v2/include/board.h +++ b/nuttx-configs/px4io-v2/include/board.h @@ -103,8 +103,6 @@ #define GPIO_USART2_RTS 0xffffffff #undef GPIO_USART2_CK #define GPIO_USART2_CK 0xffffffff -#undef GPIO_USART3_TX -#define GPIO_USART3_TX 0xffffffff #undef GPIO_USART3_CK #define GPIO_USART3_CK 0xffffffff #undef GPIO_USART3_CTS 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: |