diff --git a/arch/arm/src/armv7-m/Kconfig b/arch/arm/src/armv7-m/Kconfig index 406e2e46624..06527715679 100644 --- a/arch/arm/src/armv7-m/Kconfig +++ b/arch/arm/src/armv7-m/Kconfig @@ -160,6 +160,7 @@ config ARMV7M_STACKCHECK config ARMV7M_ITMSYSLOG bool "ITM SYSLOG support" default n + select ARCH_HAVE_SYSLOG select SYSLOG ---help--- Enable hooks to support ITM syslog output. This requires additional diff --git a/drivers/Kconfig b/drivers/Kconfig index df45c0d1722..a38908e5429 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -524,7 +524,4 @@ menuconfig DRIVERS_WIRELESS Drivers for various wireless devices. source drivers/wireless/Kconfig - -comment "System Logging Device Options" - source drivers/syslog/Kconfig diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig index c6e0cb089e0..e8a426383a3 100644 --- a/drivers/syslog/Kconfig +++ b/drivers/syslog/Kconfig @@ -5,6 +5,12 @@ comment "System Logging" +# Selected if the architecture has its own, built-in SYSLOGgin enabled + +config ARCH_HAVE_SYSLOG + bool + default n + config RAMLOG bool "RAM log device support" default n @@ -23,7 +29,7 @@ if RAMLOG config RAMLOG_SYSLOG bool "Use RAMLOG for SYSLOG" default n - depends on SYSLOG + depends on SYSLOG && !ARCH_HAVE_SYSLOG ---help--- Use the RAM logging device for the syslogging interface. If this feature is enabled (along with SYSLOG), then all debug output (only) will be re-directed @@ -72,7 +78,13 @@ config RAMLOG_NPOLLWAITERS endif -comment "System Logging" +config DRIVER_NOTE + bool "Scheduler instrumentation driver" + default n + depends on SCHED_INSTRUMENTATION_BUFFER + ---help--- + Enable building a serial driver that can be used by an application to read data + from the in-memory, scheduler instrumentatin "note" buffer. config SYSLOG bool "Advanced SYSLOG features" @@ -95,6 +107,7 @@ if SYSLOG config SYSLOG_CHAR bool "System log character device support" default y + depends on !ARCH_HAVE_SYSLOG ---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 @@ -124,11 +137,3 @@ config SYSLOG_CONSOLE output (syslog_putc). This is useful, for example, if the only console is a Telnet console. Then in that case, console output from non-Telnet threads will go to the syslog output. - -config DRIVER_NOTE - bool "Scheduler instrumentation driver" - default n - depends on SCHED_INSTRUMENTATION_BUFFER - ---help--- - Enable building a serial driver that can be used by an application to read data - from the in-memory, scheduler instrumentatin "note" buffer.