From 352d3eabb3edd3f9c708e75cc3d9931b93fb7d39 Mon Sep 17 00:00:00 2001
From: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Date: Mon, 7 Jul 2025 07:59:19 +0100
Subject: [PATCH] samples: nrf_rpc: entropy_nrf53: Use NCS network core
 Kconfigs

Uses the NCS sysbuild Kconfigs for configuring the remote image
for this sample rather than manually adding a sample which altered
the flash order

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
---
 .../nrf_rpc/entropy_nrf53/Kconfig.sysbuild    | 39 +++++++++++++++++++
 samples/nrf_rpc/entropy_nrf53/sysbuild.cmake  | 32 ---------------
 2 files changed, 39 insertions(+), 32 deletions(-)
 create mode 100644 samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild
 delete mode 100644 samples/nrf_rpc/entropy_nrf53/sysbuild.cmake

diff --git a/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild b/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild
new file mode 100644
index 000000000000..28679c4dc730
--- /dev/null
+++ b/samples/nrf_rpc/entropy_nrf53/Kconfig.sysbuild
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+if SUPPORT_NETCORE
+
+config SUPPORT_NETCORE_REMOTE
+	bool
+	default y
+
+config NRF_DEFAULT_REMOTE
+	bool
+	default y
+
+choice NETCORE
+	default NETCORE_REMOTE if NRF_DEFAULT_REMOTE && NETCORE_REMOTE_BOARD_TARGET_CPUCLUSTER != ""
+	depends on !EXTERNAL_CONFIGURED_NETCORE
+
+config NETCORE_REMOTE
+	bool "remote"
+	depends on SUPPORT_NETCORE_REMOTE
+
+endchoice
+
+if !NETCORE_NONE
+
+config NETCORE_IMAGE_NAME
+	default "remote" if NETCORE_REMOTE
+
+config NETCORE_IMAGE_PATH
+	default "${APP_DIR}/remote" if NETCORE_REMOTE
+
+endif # !NETCORE_NONE
+
+endif # SUPPORT_NETCORE
+
+source "share/sysbuild/Kconfig"
diff --git a/samples/nrf_rpc/entropy_nrf53/sysbuild.cmake b/samples/nrf_rpc/entropy_nrf53/sysbuild.cmake
deleted file mode 100644
index 500b8ac4dbcf..000000000000
--- a/samples/nrf_rpc/entropy_nrf53/sysbuild.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-
-get_property(PM_DOMAINS GLOBAL PROPERTY PM_DOMAINS)
-
-# Include app core image if enabled
-if(SB_CONFIG_SOC_NRF5340_CPUAPP)
-  # Get application core board target
-  string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}")
-  list(GET split_board_qualifiers 1 target_soc)
-  set(board_target_netcore "${BOARD}/${target_soc}/cpunet")
-  set(target_soc)
-
-  ExternalZephyrProject_Add(
-    APPLICATION remote
-    SOURCE_DIR ${APP_DIR}/remote
-    BOARD ${board_target_netcore}
-    BOARD_REVISION ${BOARD_REVISION}
-  )
-
-  if(NOT "CPUNET" IN_LIST PM_DOMAINS)
-    list(APPEND PM_DOMAINS CPUNET)
-  endif()
-
-  set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES "remote")
-  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET "remote")
-  set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
-endif()
-
-set_property(GLOBAL PROPERTY PM_DOMAINS ${PM_DOMAINS})