This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 01ff3604b09bc62600a8d2d947369650919ec616 Author: Jiuzhu Dong <[email protected]> AuthorDate: Tue May 11 17:41:29 2021 +0800 syslog/Kconfig: support config multi syslog channel delete choice for select syslog log device Change-Id: Ifc02e687526506afac46febec375062949869356 Signed-off-by: Jiuzhu Dong <[email protected]> --- drivers/syslog/Kconfig | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig index f036e79..7608830 100644 --- a/drivers/syslog/Kconfig +++ b/drivers/syslog/Kconfig @@ -126,7 +126,7 @@ config SYSLOG_TIMESTAMP_FORMATTED depends on SYSLOG_TIMESTAMP_REALTIME ---help--- Syslog timestamp will be formatted according to the - SYSLOG_TIMESTAMP_FORMAT format string. + SYSLOG_TIMESTAMP_FORMAT format string. config SYSLOG_TIMESTAMP_LOCALTIME bool "Use local-time timestamp" @@ -188,14 +188,10 @@ config SYSLOG_COLOR_OUTPUT ---help--- Enables colored output in syslog, according to message priority. -choice - prompt "System log device" - default SYSLOG_CONSOLE if !ARCH_LOWPUTC - default SYSLOG_DEFAULT if ARCH_LOWPUTC - depends on !ARCH_SYSLOG - +if !ARCH_SYSLOG config SYSLOG_CHAR bool "Log to a character device" + default n ---help--- Enable the generic character device for the SYSLOG. The full path to the SYSLOG device is provided by SYSLOG_DEVPATH. A valid character device (or @@ -203,7 +199,8 @@ config SYSLOG_CHAR config RAMLOG_SYSLOG bool "Use RAMLOG for SYSLOG" - depends on RAMLOG && !ARCH_SYSLOG + depends on RAMLOG + default n ---help--- Use the RAM logging device for the syslogging interface. If this feature is enabled (along with SYSLOG), then all debug output (only) @@ -212,6 +209,7 @@ config RAMLOG_SYSLOG config SYSLOG_CONSOLE bool "Log to /dev/console" + default !ARCH_LOWPUTC && !SYSLOG_RPMSG && !RAMLOG_SYSLOG && !SYSLOG_CHAR depends on DEV_CONSOLE ---help--- Use the system console as a SYSLOG output device. @@ -220,23 +218,26 @@ config SYSLOG_RPMSG bool "Log to RPMSG" depends on OPENAMP depends on SCHED_WORKQUEUE + default n ---help--- Use the rpmsg as a SYSLOG output device, send message to remote proc. -config SYSLOG_RPMSG_SERVER_NAME - string "The name of Syslog Rpmsg Server" - depends on SYSLOG_RPMSG - ---help--- - The proc name of rpmsg server. Client sends message to - specified name of remote proc. - config SYSLOG_DEFAULT bool "Default SYSLOG device" + default ARCH_LOWPUTC && !SYSLOG_RPMSG && !SYSLOG_CONSOLE && !RAMLOG_SYSLOG && !SYSLOG_CHAR ---help--- syslog() interfaces will be present, but all output will go to the up_putc(ARCH_LOWPUTC == y) or bit-bucket(ARCH_LOWPUTC == n). -endchoice +endif + +config SYSLOG_RPMSG_SERVER_NAME + string "The name of Syslog Rpmsg Server" + depends on SYSLOG_RPMSG + default "" + ---help--- + The proc name of rpmsg server. Client sends message to + specified name of remote proc. config SYSLOG_RPMSG_WORK_DELAY int "SYSLOG RPMSG work delay(ms)"
