diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-04 21:36:15 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-04 21:36:15 +0100 |
| commit | 86c80678ae8a7027751fadea1ceec48d0a811122 (patch) | |
| tree | 26f82cf02b273f62183038b0a0e408bcfac7dffb | |
| parent | 3639c7ae91f5226b71cdba8d8cc98eae4bba7e07 (diff) | |
| parent | 9817922bf96611f59552b6a6fd2aebab790135f5 (diff) | |
| download | px4-firmware-86c80678ae8a7027751fadea1ceec48d0a811122.tar.gz px4-firmware-86c80678ae8a7027751fadea1ceec48d0a811122.tar.bz2 px4-firmware-86c80678ae8a7027751fadea1ceec48d0a811122.zip | |
Merge branch 'master' of github.com:PX4/Firmware
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 2a734c27e..26222c255 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -306,7 +306,7 @@ CONFIG_UART5_RXDMA=y # CONFIG_USART6_RS485 is not set CONFIG_USART6_RXDMA=y # CONFIG_UART7_RS485 is not set -# CONFIG_UART7_RXDMA is not set +CONFIG_UART7_RXDMA=y # CONFIG_UART8_RS485 is not set CONFIG_UART8_RXDMA=y CONFIG_SERIAL_DISABLE_REORDERING=y @@ -539,8 +539,8 @@ CONFIG_SERIAL_NPOLLWAITERS=2 # CONFIG_USART3_SERIAL_CONSOLE is not set # CONFIG_UART4_SERIAL_CONSOLE is not set # CONFIG_USART6_SERIAL_CONSOLE is not set -# CONFIG_UART7_SERIAL_CONSOLE is not set -CONFIG_UART8_SERIAL_CONSOLE=y +CONFIG_UART7_SERIAL_CONSOLE=y +# CONFIG_UART8_SERIAL_CONSOLE is not set # CONFIG_NO_SERIAL_CONSOLE is not set # |