From d7a05dfcc6134c01b8322dc65de5d1691443dff7 Mon Sep 17 00:00:00 2001
From: simbit18 <101105604+simbit18@users.noreply.github.com>
Date: Tue, 22 Jul 2025 12:04:06 +0200
Subject: [PATCH] drivers/segger: Add a kconfig to override Segger SystemView
 target sources version

update:
    CMakeLists.txt
    Make.defs
    Kconfig

It allows the same version of SystemView target sources to be used for CMake and Make, to avoid discrepancies in the future.

Signed-off-by: simbit18 <simbit18@gmail.com>
---
 drivers/segger/CMakeLists.txt | 4 +---
 drivers/segger/Kconfig        | 6 ++++++
 drivers/segger/Make.defs      | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/segger/CMakeLists.txt b/drivers/segger/CMakeLists.txt
index 6c0d2d3bc09..2a5aafd9ac9 100644
--- a/drivers/segger/CMakeLists.txt
+++ b/drivers/segger/CMakeLists.txt
@@ -23,13 +23,11 @@
 if(CONFIG_SEGGER_RTT OR CONFIG_SEGGER_SYSVIEW)
   if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/SystemView)
 
-    set(SYSVIEW_VERSION 356)
-
     FetchContent_Declare(
       systemview
       DOWNLOAD_NAME "SystemView.zip"
       DOWNLOAD_DIR ${CMAKE_CURRENT_LIST_DIR}
-      URL "https://www.segger.com/downloads/systemview/SystemView_Src_V${SYSVIEW_VERSION}.zip"
+      URL "https://www.segger.com/downloads/systemview/SystemView_Src_V${CONFIG_SEGGER_SYSVIEW_TARGET_SOURCE}.zip"
           SOURCE_DIR
           ${CMAKE_CURRENT_LIST_DIR}/SystemView
           BINARY_DIR
diff --git a/drivers/segger/Kconfig b/drivers/segger/Kconfig
index 35b5c4ecdcc..0e4323fe4b6 100644
--- a/drivers/segger/Kconfig
+++ b/drivers/segger/Kconfig
@@ -14,6 +14,12 @@ config SEGGER_RTT
 
 if SEGGER_RTT
 
+config SEGGER_SYSVIEW_TARGET_SOURCE
+	string "Segger SystemView target sources version"
+	default "356"
+	---help---
+		The Segger SystemView target sources version to use.
+
 config SEGGER_RTT_SECTION
 	string "Segger RTT Control Block Section"
 	default ""
diff --git a/drivers/segger/Make.defs b/drivers/segger/Make.defs
index c4ddc05bce8..2ce5a238609 100644
--- a/drivers/segger/Make.defs
+++ b/drivers/segger/Make.defs
@@ -72,7 +72,7 @@ endif
 ifneq ($(CONFIG_SEGGER_RTT)$(CONFIG_SEGGER_SYSVIEW),)
   CFLAGS += ${INCDIR_PREFIX}segger$(DELIM)SystemView$(DELIM)SEGGER
 
-  SYSVIEW_VERSION ?= 356
+  SYSVIEW_VERSION ?= $(CONFIG_SEGGER_SYSVIEW_TARGET_SOURCE)
   SYSVIEW_ZIP = SystemView_Src_V$(SYSVIEW_VERSION).zip
 
 # Download and unpack tarball if no git repo found