From 2f8c198f9163aafe8f61ffe8410ebbb192a989c3 Mon Sep 17 00:00:00 2001
From: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
Date: Thu, 24 Oct 2024 16:56:24 +0200
Subject: [PATCH] sysbuild: sdp: enforce namespacing in Kconfigs

They should start with `SDP_GPIO`.

Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no>
---
 sysbuild/Kconfig.sdp | 40 +++++++++++++++++-----------------------
 sysbuild/sdp.cmake   |  4 ++--
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/sysbuild/Kconfig.sdp b/sysbuild/Kconfig.sdp
index fd511f3ebc70..7529d937e07f 100644
--- a/sysbuild/Kconfig.sdp
+++ b/sysbuild/Kconfig.sdp
@@ -9,39 +9,33 @@ menuconfig SDP
 
 if SDP
 
-config EGPIO_FLPR_APPLICATION
-	bool "SDP GPIO FLPR application"
-	help
-	  Include FLPR side SDP GPIO application in build.
-	  FLPR SDP GPIO application is an SDP GPIO driver built for an FLPR core that receives commands
-	  from the app core and controls the pin states based on them.
-
-choice EGPIO_BACKEND
-	prompt "SDP GPIO driver backend type"
-	depends on EGPIO_FLPR_APPLICATION
-	default EGPIO_BACKEND_ICMSG
+config SDP_GPIO
+	bool "SDP GPIO application"
+
+if SDP_GPIO
+
+choice SDP_GPIO_BACKEND
+	prompt "SDP GPIO backend type"
+	default SDP_GPIO_BACKEND_ICMSG
 	help
-	  Select the backend type for the SDP GPIO driver and application.
+	  Select the backend type for SDP.
 
-config EGPIO_BACKEND_MBOX
-	bool "MBOX backend for SDP GPIO"
+config SDP_GPIO_BACKEND_MBOX
+	bool "MBOX backend"
 	help
-	  Use MBOX backend driver for SDP GPIO.
 	  The MBOX version is more resource-efficient than the ICMSG backend,
 	  but needs to have a shared structure defined as a communication channel.
 
-config EGPIO_BACKEND_ICMSG
-	bool "ICMSG backend for SDP GPIO"
-	help
-	  Use ICMSG backend driver for SDP GPIO.
+config SDP_GPIO_BACKEND_ICMSG
+	bool "ICMSG backend"
 
-config EGPIO_BACKEND_ICBMSG
-	bool "ICBMSG backend for SDP GPIO"
-	help
-	  Use ICBMSG backend driver for SDP GPIO.
+config SDP_GPIO_BACKEND_ICBMSG
+	bool "ICBMSG backend"
 
 endchoice
 
+endif # SDP_GPIO
+
 endif # SDP
 
 endmenu
diff --git a/sysbuild/sdp.cmake b/sysbuild/sdp.cmake
index 1e76246c459e..2167bfac5655 100644
--- a/sysbuild/sdp.cmake
+++ b/sysbuild/sdp.cmake
@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
-# If it is enabled, include the SDP GPIO FLPR application in the build
-if(SB_CONFIG_EGPIO_FLPR_APPLICATION)
+# If it is enabled, include the SDP GPIO application in the build
+if(SB_CONFIG_SDP_GPIO)
   # Extract SoC name from related variables
   string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}")
   list(GET split_board_qualifiers 1 target_soc)