From 1cfc85bab89deffea303e115f7d9d8a81a7b8cb0 Mon Sep 17 00:00:00 2001
From: Henrik Brix Andersen <hebad@vestas.com>
Date: Thu, 30 Mar 2023 10:30:20 +0200
Subject: [PATCH] modules: segger: move Kconfig to modules/segger

Move the Segger RTT module Kconfig to modules/segger/kconfig. The Segger
debug library is not a driver and should not reside under drivers/debug.

Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
---
 drivers/Kconfig                                     | 1 -
 drivers/debug/Kconfig                               | 4 ----
 modules/Kconfig                                     | 3 +++
 drivers/debug/Kconfig.rtt => modules/segger/Kconfig | 5 ++++-
 west.yml                                            | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 drivers/debug/Kconfig
 rename drivers/debug/Kconfig.rtt => modules/segger/Kconfig (97%)

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 1b5d60cd450..1032cd57bb4 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -18,7 +18,6 @@ source "drivers/counter/Kconfig"
 source "drivers/crypto/Kconfig"
 source "drivers/dac/Kconfig"
 source "drivers/dai/Kconfig"
-source "drivers/debug/Kconfig"
 source "drivers/disk/Kconfig"
 source "drivers/display/Kconfig"
 source "drivers/dma/Kconfig"
diff --git a/drivers/debug/Kconfig b/drivers/debug/Kconfig
deleted file mode 100644
index a5bd0b8b0ac..00000000000
--- a/drivers/debug/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (c) 2020 Intel Corporation
-# SPDX-License-Identifier: Apache-2.0
-
-source "drivers/debug/Kconfig.rtt"
diff --git a/modules/Kconfig b/modules/Kconfig
index a9b4abc87c6..a34e4a15476 100644
--- a/modules/Kconfig
+++ b/modules/Kconfig
@@ -99,6 +99,9 @@ comment "CHRE module not available."
 comment "THRIFT module not available."
 	depends on !ZEPHYR_THRIFT_MODULE
 
+comment "Segger module not available."
+	depends on !ZEPHYR_SEGGER_MODULE
+
 # This ensures that symbols are available in Kconfig for dependency checking
 # and referencing, while keeping the settings themselves unavailable when the
 # modules are not present in the workspace
diff --git a/drivers/debug/Kconfig.rtt b/modules/segger/Kconfig
similarity index 97%
rename from drivers/debug/Kconfig.rtt
rename to modules/segger/Kconfig
index 8a0912c1836..665e3ff716c 100644
--- a/drivers/debug/Kconfig.rtt
+++ b/modules/segger/Kconfig
@@ -1,6 +1,9 @@
 # Copyright (c) 2016 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
+config ZEPHYR_SEGGER_MODULE
+	bool
+
 config HAS_SEGGER_RTT
 	bool
 	help
@@ -41,7 +44,7 @@ config SEGGER_RTT_PRINTF_BUFFER_SIZE
 	int "Size of buffer for RTT printf to bulk-send chars via RTT"
 	default 64
 
-choice
+choice SEGGER_RTT_MODE
 	prompt "Mode for pre-initialized terminal channel (buffer 0)"
 	default SEGGER_RTT_MODE_NO_BLOCK_SKIP
 
diff --git a/west.yml b/west.yml
index 3c03b46a03d..5846f2b9797 100644
--- a/west.yml
+++ b/west.yml
@@ -209,7 +209,7 @@ manifest:
       path: modules/lib/picolibc
       revision: 93b5d5f2ad44867b60267417cd6d6250dbf68983
     - name: segger
-      revision: e2ff2200556e8a8f962921444275c04971a2bb3d
+      revision: 4bfaf28a11c3e5ec29badac744fab6d2f342749e
       path: modules/debug/segger
       groups:
         - debug