aboutsummaryrefslogtreecommitdiff
path: root/nuttx/configs
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-02-17 15:29:31 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-02-17 15:29:31 +0100
commit8f8e30052bc6fb9a833b53570e8e836ea6686f1f (patch)
treee1b75b27fdb3c4a8942ead12a17b054d36cb0a7b /nuttx/configs
parent6bd18e46bb3b250213bb64d9b0da2e71ddc912ab (diff)
parentcaa11f0bbb7f30679c5c01a64e1d0f6d8627db9d (diff)
downloadpx4-firmware-8f8e30052bc6fb9a833b53570e8e836ea6686f1f.tar.gz
px4-firmware-8f8e30052bc6fb9a833b53570e8e836ea6686f1f.tar.bz2
px4-firmware-8f8e30052bc6fb9a833b53570e8e836ea6686f1f.zip
Merged
Diffstat (limited to 'nuttx/configs')
-rw-r--r--nuttx/configs/README.txt2
-rwxr-xr-xnuttx/configs/px4fmu/nsh/defconfig1
-rwxr-xr-xnuttx/configs/px4io/io/defconfig1
3 files changed, 3 insertions, 1 deletions
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index 1b78567a3..8d9bb381f 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -261,7 +261,7 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_DEBUG - enables built-in debug options
CONFIG_DEBUG_VERBOSE - enables verbose debug output
- CCONFIG_DEBUG_ENABLE - Support an interface to enable or disable debug output.
+ CCONFIG_SYSLOG_ENABLE - Support an interface to enable or disable debug output.
CONFIG_DEBUG_SYMBOLS - build without optimization and with
debug symbols (needed for use with a debugger).
CONFIG_DEBUG_SCHED - enable OS debug output (disabled by
diff --git a/nuttx/configs/px4fmu/nsh/defconfig b/nuttx/configs/px4fmu/nsh/defconfig
index b579096ef..3fd27db11 100755
--- a/nuttx/configs/px4fmu/nsh/defconfig
+++ b/nuttx/configs/px4fmu/nsh/defconfig
@@ -246,6 +246,7 @@ CONFIG_AT24XX_MTD_BLOCKSIZE=256
#
CONFIG_SERIAL_TERMIOS=y
CONFIG_SERIAL_CONSOLE_REINIT=y
+CONFIG_STANDARD_SERIAL=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n
diff --git a/nuttx/configs/px4io/io/defconfig b/nuttx/configs/px4io/io/defconfig
index d2a4f3848..78e868b4f 100755
--- a/nuttx/configs/px4io/io/defconfig
+++ b/nuttx/configs/px4io/io/defconfig
@@ -159,6 +159,7 @@ CONFIG_STM32_ADC3=n
# CONFIG_USARTn_2STOP - Two stop bits
#
CONFIG_SERIAL_TERMIOS=y
+CONFIG_STANDARD_SERIAL=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_USART2_SERIAL_CONSOLE=n