samples: Add sample to verify bootloader requests

Add a sample variant that can be used to verify the bootloader request
module.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_requests.overlay

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include "../sysbuild/nrf54h20dk_nrf54h20_memory_map_requests.dtsi"
+
+/ {
+	chosen {
+		zephyr,boot-mode = &boot_request;
+	};
+};

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/prj_requests.conf

@@ -0,0 +1,49 @@
+# Enable MCUmgr and dependencies.
+CONFIG_NET_BUF=y
+CONFIG_ZCBOR=y
+CONFIG_CRC=y
+CONFIG_MCUMGR=y
+CONFIG_STREAM_FLASH=y
+CONFIG_FLASH_MAP=y
+
+# Some command handlers require a large stack.
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
+CONFIG_MAIN_STACK_SIZE=2176
+
+# Ensure an MCUboot-compatible binary is generated.
+CONFIG_BOOTLOADER_MCUBOOT=y
+
+# Enable flash operations.
+CONFIG_FLASH=y
+
+# Required by the `taskstat` command.
+CONFIG_THREAD_MONITOR=y
+
+# Support for taskstat command
+CONFIG_MCUMGR_GRP_OS_TASKSTAT=y
+
+# Enable statistics and statistic names.
+CONFIG_STATS=y
+CONFIG_STATS_NAMES=y
+
+# Enable most core commands.
+CONFIG_FLASH=y
+CONFIG_IMG_MANAGER=y
+CONFIG_MCUMGR_GRP_IMG=y
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_STAT=y
+
+# Enable logging
+CONFIG_LOG=y
+CONFIG_MCUBOOT_UTIL_LOG_LEVEL_WRN=y
+
+# Disable debug logging
+CONFIG_LOG_MAX_LEVEL=3
+
+# Enable boot requests through retained memory.
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_MCUBOOT_BOOT_REQUEST=y
+
+CONFIG_RETENTION_BOOT_MODE=y
+CONFIG_MCUMGR_GRP_OS_RESET_BOOT_MODE=y

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sample.yaml

@@ -42,3 +42,17 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
+  sample.mcumgr.smp_svr.bt.nrf54h20dk.direct_xip_withrequests:
+    sysbuild: true
+    extra_args:
+      - FILE_SUFFIX="requests"
+      - EXTRA_CONF_FILE="overlay-bt.conf"
+      - SB_CONFIG_NETCORE_IPC_RADIO=y
+      - SB_CONFIG_NETCORE_IPC_RADIO_BT_HCI_IPC=y
+      - SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT=y
+      - mcuboot_CONFIG_NRF_SECURITY=y
+      - mcuboot_CONFIG_MULTITHREADING=y
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_requests.conf

@@ -0,0 +1,4 @@
+# Enable boot requests through retained memory.
+CONFIG_RETAINED_MEM=y
+CONFIG_RETENTION=y
+CONFIG_MCUBOOT_BOOT_REQUEST=y

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_requests.overlay

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+ #include "nrf54h20dk_nrf54h20_memory_map_requests.dtsi"
+
+/ {
+	chosen {
+		zephyr,code-partition = &boot_partition;
+	};
+};

samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/nrf54h20dk_nrf54h20_memory_map_requests.dtsi

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/* On nRF54H20 the Direct XIP mode is supported in the merged slot configuration
+ * Merge application and radio slots by extending the application parition.
+ */
+&cpuapp_slot0_partition {
+	reg = <0x40000 DT_SIZE_K(656)>;
+};
+
+&cpuapp_slot1_partition {
+	reg = <0x100000 DT_SIZE_K(656)>;
+};
+
+/ {
+	chosen {
+		zephyr,bootloader-request = &boot_request;
+	};
+};
+
+/ {
+	reserved-memory {
+		cpuapp_retained_mem: memory@e1ad000 {
+			compatible = "zephyr,memory-region";
+			reg = <0xe1ad000 DT_SIZE_K(4)>;
+			zephyr,memory-region = "RetainedMem";
+			status = "okay";
+
+			retainedmem {
+				compatible = "zephyr,retained-ram";
+				status = "okay";
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				boot_request: boot_request@0 {
+					compatible = "zephyr,retention";
+					status = "okay";
+					reg = <0x0 16>;
+					prefix = [0B 01];
+					checksum = <4>;
+				};
+			};
+		};
+	};
+};

west.yml

@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 9a8c5b0383549678c6a903190b19c62101243fde
+      revision: pull/3083/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -128,7 +128,7 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: d24b28f652e2eeb6117b9c60fca0277db3d4e226
+      revision: pull/477/head
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR