Skip to content

Commit 22e3259

Browse files
author
Christopher Friedt
committed
logging: move backends to subdirectory
This is mainly to reduce clutter in `subsys/logging`, but also to make backend management slightly easier. Signed-off-by: Christopher Friedt <[email protected]>
1 parent 24984de commit 22e3259

29 files changed

+578
-539
lines changed

subsys/logging/CMakeLists.txt

Lines changed: 5 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -32,90 +32,27 @@ if(NOT CONFIG_LOG_MODE_MINIMAL)
3232
endif()
3333
endif()
3434

35-
zephyr_sources_ifdef(
36-
CONFIG_LOG_BACKEND_UART
37-
log_backend_uart.c
38-
)
39-
40-
zephyr_sources_ifdef(
41-
CONFIG_LOG_BACKEND_FS
42-
log_backend_fs.c
43-
)
44-
4535
zephyr_sources_ifdef(
4636
CONFIG_LOG_CMDS
4737
log_cmds.c
4838
)
4939

5040
zephyr_sources_ifdef(
51-
CONFIG_LOG_BACKEND_NATIVE_POSIX
52-
log_backend_native_posix.c
53-
)
54-
55-
zephyr_sources_ifdef(
56-
CONFIG_LOG_BACKEND_XTENSA_SIM
57-
log_backend_xtensa_sim.c
58-
)
59-
60-
zephyr_sources_ifdef(
61-
CONFIG_LOG_BACKEND_NET
62-
log_backend_net.c
63-
)
64-
65-
zephyr_sources_ifdef(
66-
CONFIG_LOG_BACKEND_RTT
67-
log_backend_rtt.c
41+
CONFIG_LOG_FRONTEND_DICT_UART
42+
log_frontend_dict_uart.c
6843
)
6944

7045
zephyr_sources_ifdef(
71-
CONFIG_LOG_BACKEND_SWO
72-
log_backend_swo.c
46+
CONFIG_LOG_DICTIONARY_SUPPORT
47+
log_output_dict.c
7348
)
7449

7550
zephyr_sources_ifdef(
7651
CONFIG_LOG_MIPI_SYST_ENABLE
7752
log_output_syst.c
7853
)
7954

80-
zephyr_sources_ifdef(
81-
CONFIG_LOG_BACKEND_ADSP
82-
log_backend_adsp.c
83-
)
84-
85-
zephyr_sources_ifdef(
86-
CONFIG_LOG_BACKEND_ADSP_HDA
87-
log_backend_adsp_hda.c
88-
)
89-
90-
zephyr_sources_ifdef(
91-
CONFIG_LOG_BACKEND_ADSP_MTRACE
92-
log_backend_adsp_mtrace.c
93-
)
94-
95-
zephyr_sources_ifdef(
96-
CONFIG_LOG_BACKEND_EFI_CONSOLE
97-
log_backend_efi_console.c
98-
)
99-
100-
if(CONFIG_LOG_BACKEND_SPINEL)
101-
zephyr_library_include_directories(
102-
${ZEPHYR_BASE}/subsys/net/lib/openthread/platform/
103-
)
104-
endif()
105-
106-
zephyr_sources_ifdef(
107-
CONFIG_LOG_BACKEND_SPINEL
108-
log_backend_spinel.c
109-
)
110-
111-
zephyr_sources_ifdef(
112-
CONFIG_LOG_FRONTEND_DICT_UART
113-
log_frontend_dict_uart.c
114-
)
115-
116-
if(CONFIG_LOG_DICTIONARY_SUPPORT)
117-
zephyr_sources(log_output_dict.c)
118-
endif()
55+
add_subdirectory(backends)
11956

12057
else()
12158
zephyr_sources(log_minimal.c)

subsys/logging/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rsource "Kconfig.formatting"
2424

2525
if !LOG_FRONTEND_ONLY
2626

27-
rsource "Kconfig.backends"
27+
rsource "backends/Kconfig"
2828

2929
endif # !LOG_FRONTEND_ONLY
3030

0 commit comments

Comments
 (0)