Skip to content

Commit 6262304

Browse files
fg-cfhcfriedt
authored andcommitted
tracing: segger-sysview: conf include fix
The Zephyr-specific Segger SystemView configuration was not used as the same file was available inside the external Segger module with higher import priority. Fixes the regression by moving the SystemView configuration to the same place in the external module where RTT configuration already resides and thereby creates a canonical include path to avoid further regressions of the same kind. Fixes: #61133 Signed-off-by: Florian Grandel <[email protected]>
1 parent 438bd1d commit 6262304

File tree

3 files changed

+1
-40
lines changed

3 files changed

+1
-40
lines changed

modules/segger/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ if(CONFIG_USE_SEGGER_RTT)
44
zephyr_include_directories_ifdef(CONFIG_USE_SEGGER_RTT
55
${SEGGER_DIR}/SEGGER
66
${SEGGER_DIR}/Config
7-
.
87
)
98
zephyr_library_sources(
109
${SEGGER_DIR}/SEGGER/SEGGER_RTT.c

modules/segger/SEGGER_SYSVIEW_Conf.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ manifest:
309309
path: modules/lib/picolibc
310310
revision: d07c38ff051386f8e09a143ea0a6c1d6d66dd1d8
311311
- name: segger
312-
revision: 5792675a2470d0f3857de1e77bff57b38c28de3b
312+
revision: 9d0191285956cef43daf411edc2f1a7788346def
313313
path: modules/debug/segger
314314
groups:
315315
- debug

0 commit comments

Comments
 (0)