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 <fgrandel@code-for-humans.de>

modules/segger/CMakeLists.txt

@@ -4,7 +4,6 @@ if(CONFIG_USE_SEGGER_RTT)
   zephyr_include_directories_ifdef(CONFIG_USE_SEGGER_RTT
     ${SEGGER_DIR}/SEGGER
     ${SEGGER_DIR}/Config
-    .
   )
   zephyr_library_sources(
     ${SEGGER_DIR}/SEGGER/SEGGER_RTT.c

modules/segger/SEGGER_SYSVIEW_Conf.h

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2020 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef SEGGER_SEGGER_SYSVIEW_CONF_H_
-#define SEGGER_SEGGER_SYSVIEW_CONF_H_
-
-#include <stdint.h>
-
-#define SEGGER_SYSVIEW_GET_TIMESTAMP sysview_get_timestamp
-#define SEGGER_SYSVIEW_GET_INTERRUPT_ID sysview_get_interrupt
-
-uint32_t sysview_get_timestamp(void);
-uint32_t sysview_get_interrupt(void);
-
-#define SEGGER_SYSVIEW_RTT_BUFFER_SIZE CONFIG_SEGGER_SYSVIEW_RTT_BUFFER_SIZE
-#define SEGGER_SYSVIEW_POST_MORTEM_MODE CONFIG_SEGGER_SYSVIEW_POST_MORTEM_MODE
-#define SEGGER_SYSVIEW_RTT_CHANNEL CONFIG_SEGGER_SYSVIEW_RTT_CHANNEL
-
-#if defined(CONFIG_SEGGER_SYSVIEW_SECTION_DTCM)
-#define SEGGER_SYSVIEW_SECTION	".dtcm_data"
-#endif
-
-extern unsigned int zephyr_rtt_irq_lock(void);
-extern void zephyr_rtt_irq_unlock(unsigned int key);
-
-/* Lock SystemView (nestable) */
-#define SEGGER_SYSVIEW_LOCK()	{					       \
-					unsigned int __sysview_irq_key =       \
-						zephyr_rtt_irq_lock()
-
-/* Unlock SystemView (nestable) */
-#define SEGGER_SYSVIEW_UNLOCK()		zephyr_rtt_irq_unlock(__sysview_irq_key);         \
-				}
-
-#endif  /* SEGGER_SEGGER_SYSVIEW_CONF_H_ */

west.yml

@@ -309,7 +309,7 @@ manifest:
       path: modules/lib/picolibc
       revision: d07c38ff051386f8e09a143ea0a6c1d6d66dd1d8
     - name: segger
-      revision: 5792675a2470d0f3857de1e77bff57b38c28de3b
+      revision: 9d0191285956cef43daf411edc2f1a7788346def
       path: modules/debug/segger
       groups:
         - debug