Skip to content

Commit 3e3e7d1

Browse files
committed
[nrf fromlist] logging: Fix LOG_OUTPUT dependency
When CONFIG_LOG_OUTPUT is set, it indicates that logging strings are formatted by the application (using log_output module). It is not needed when backend works in the dictionary mode. So far LOG_OUTPUT was set also when dictionary mode was used and that prevented removing of the logging strings from binary which is an important feature of the dictionary logging. Upstream PR: zephyrproject-rtos/zephyr#79506 Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 8e5b4ae commit 3e3e7d1

File tree

13 files changed

+1
-12
lines changed

13 files changed

+1
-12
lines changed

subsys/logging/Kconfig.template.log_format_config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ choice "LOG_BACKEND_$(backend)_OUTPUT"
77

88
config LOG_BACKEND_$(backend)_OUTPUT_TEXT
99
bool "Text"
10+
select LOG_OUTPUT
1011
help
1112
Output in text.
1213

subsys/logging/backends/Kconfig.adsp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
config LOG_BACKEND_ADSP
55
bool "Intel ADSP buffer backend"
66
depends on SOC_FAMILY_INTEL_ADSP
7-
select LOG_OUTPUT
87
select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
98
help
109
Enable backend for the host trace protocol of the Intel ADSP

subsys/logging/backends/Kconfig.adsp_mtrace

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
config LOG_BACKEND_ADSP_MTRACE
55
bool "Intel ADSP mtrace backend"
66
depends on SOC_FAMILY_INTEL_ADSP
7-
select LOG_OUTPUT
87
select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
98
help
109
Provide a logging backend which writes to SRAM window

subsys/logging/backends/Kconfig.ble

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ config LOG_BACKEND_BLE
55
bool "Bluetooth Low Energy (BLE) backend"
66
depends on BT
77
depends on LOG_PROCESS_THREAD_STACK_SIZE>=2048
8-
select LOG_OUTPUT
98
select EXPERIMENTAL
109
help
1110
Backend that sends log messages over Bluetooth LE Notifications. This

subsys/logging/backends/Kconfig.efi_console

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
config LOG_BACKEND_EFI_CONSOLE
55
bool "EFI_CONSOLE backend"
66
depends on X86_EFI_CONSOLE
7-
select LOG_OUTPUT
87
default y if !UART_CONSOLE
98
help
109
When enabled backend is using EFI CONSOLE to output logs.

subsys/logging/backends/Kconfig.fs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
config LOG_BACKEND_FS
55
bool "File system backend"
66
depends on FILE_SYSTEM
7-
select LOG_OUTPUT
87
select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
98
help
109
When enabled, backend is using the configured file system to output logs.

subsys/logging/backends/Kconfig.native_posix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ config LOG_BACKEND_NATIVE_POSIX
55
bool "Native backend"
66
depends on ARCH_POSIX
77
default y
8-
select LOG_OUTPUT
98
select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
109
help
1110
Enable backend in native_posix

subsys/logging/backends/Kconfig.net

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
config LOG_BACKEND_NET
77
bool "Networking backend"
88
depends on NETWORKING && (NET_UDP || NET_TCP) && !LOG_MODE_IMMEDIATE
9-
select LOG_OUTPUT
109
help
1110
Send syslog messages to network server.
1211
See RFC 5424 (syslog protocol) and RFC 5426 (syslog over UDP) and

subsys/logging/backends/Kconfig.rtt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config LOG_BACKEND_RTT
66
depends on USE_SEGGER_RTT
77
default y if !SHELL_BACKEND_RTT
88
select SEGGER_RTT_CUSTOM_LOCKING
9-
select LOG_OUTPUT
109
select LOG_BACKEND_SUPPORTS_FORMAT_TIMESTAMP
1110
help
1211
When enabled, backend will use RTT for logging. This backend works on a per

subsys/logging/backends/Kconfig.spinel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ config LOG_BACKEND_SPINEL
55
bool "OpenThread dedicated Spinel protocol backend"
66
depends on !LOG_BACKEND_UART
77
depends on NET_L2_OPENTHREAD
8-
select LOG_OUTPUT
98
help
109
When enabled, backend will use OpenThread dedicated SPINEL protocol for logging.
1110
This protocol is byte oriented and wraps given messages into serial frames.

0 commit comments

Comments
 (0)