treewide: Include FOTA support

pascal-nordic · pascal-nordic · commit da92ac118746 · 2026-06-02T12:27:43.000+02:00
The implementation covers the necessary changes to do the different
FOTA types:
- host: Update the host MCU that is connected through SMP with the modem.
- mfw: Modem firmware inside the nRF91
- mfw-app: Serial model application update.

This demonstrate the configuration needed for the new Clover UX/UI.

Jira: CLOUDMCU-159

Signed-off-by: Pascal Hernandez &lt;pascal.hernandez@nordicsemi.no&gt;
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -34,6 +34,7 @@ target_sources_ifdef(CONFIG_SM_HTTPC app PRIVATE src/sm_at_httpc.c)
 target_sources_ifdef(CONFIG_SM_MODEM_TRACE_BACKEND_CMUX app PRIVATE src/sm_trace_backend_cmux.c)
 target_sources_ifdef(CONFIG_SM_MODEM_TRACE_BACKEND_UART app PRIVATE src/sm_trace_backend_uart.c)
 target_sources_ifdef(CONFIG_NRF_PROVISIONING app PRIVATE src/sm_at_provisioning.c)
+target_sources_ifdef(CONFIG_SM_SMP_CLIENT app PRIVATE src/sm_smp_client.c)
 
 add_subdirectory_ifdef(CONFIG_SM_CARRIER src/lwm2m_carrier)
 
diff --git a/app/Kconfig b/app/Kconfig
@@ -433,6 +433,12 @@ config UART_2_NRF_HW_ASYNC_TIMER
 
 endif # UART_ASYNC_API
 
+config SM_SMP_CLIENT
+	bool "SMP client echo on boot (wired UART to host MCU)"
+	help
+	  When enabled, initializes an MCUmgr SMP client on the UART selected by
+	  zephyr,uart-mcumgr and sends a one-shot OS echo command at boot.
+
 module = SM
 module-str = serial modem
 source "$(ZEPHYR_BASE)/subsys/logging/Kconfig.template.log_config"
diff --git a/app/overlay-smp-client.conf b/app/overlay-smp-client.conf
@@ -0,0 +1,23 @@
+# Copyright (c) 2026 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+CONFIG_SM_SMP_CLIENT=y
+
+CONFIG_NET_BUF=y
+CONFIG_ZCBOR=y
+CONFIG_ZCBOR_CANONICAL=y
+CONFIG_CRC=y
+CONFIG_MCUMGR=y
+CONFIG_SMP_CLIENT=y
+
+CONFIG_BASE64=y
+CONFIG_UART_MCUMGR=y
+CONFIG_MCUMGR_TRANSPORT_UART=y
+
+CONFIG_MCUMGR_GRP_OS_CLIENT=y
+CONFIG_MCUMGR_GRP_OS_CLIENT_ECHO=y
+CONFIG_MCUMGR_GRP_OS_CLIENT_RESET=n
+
+# Logs use the app's native UART backend on zephyr,console = uart1 (VCOM1).
+# Enable at runtime with AT#XLOG=1. The SMP transport is on its own UART
+# (uart2, see overlay-smp-client.overlay), so the two never collide.
diff --git a/app/overlay-smp-client.overlay b/app/overlay-smp-client.overlay
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		/* SMP transport on uart2 (SERIAL2, free because the board overlay
+		 * disables i2c2). uart1 stays as the VCOM1 console/log UART, so the
+		 * app's sm_log never suspends the SMP link.
+		 *
+		 * Pins are the free Arduino-header GPIOs D2/D3/D6/D7
+		 * (P0.02/03/06/07). The earlier P0.28/29/30/31 choice collided with
+		 * VCOM1's own console pins (P0.28/29) and the on-board TWI/I2C2 bus
+		 * (P0.30/31, with pull-ups), which corrupted the SMP framing.
+		 */
+		zephyr,uart-mcumgr = &uart2;
+	};
+};
+
+&pinctrl {
+	uart2_smp_default: uart2_smp_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 2)>,
+				<NRF_PSEL(UART_RTS, 0, 6)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 3)>,
+				<NRF_PSEL(UART_CTS, 0, 7)>;
+			bias-pull-up;
+		};
+	};
+
+	uart2_smp_sleep: uart2_smp_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 2)>,
+				<NRF_PSEL(UART_RX, 0, 3)>,
+				<NRF_PSEL(UART_RTS, 0, 6)>,
+				<NRF_PSEL(UART_CTS, 0, 7)>;
+			low-power-enable;
+		};
+	};
+};
+
+&uart2 {
+	status = "okay";
+	current-speed = <115200>;
+	hw-flow-control;
+	pinctrl-0 = <&uart2_smp_default>;
+	pinctrl-1 = <&uart2_smp_sleep>;
+	pinctrl-names = "default", "sleep";
+};
diff --git a/app/src/sm_smp_client.c b/app/src/sm_smp_client.c
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
+#include <zephyr/mgmt/mcumgr/smp/smp_client.h>
+#include <zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt_client.h>
+
+LOG_MODULE_REGISTER(sm_smp_client, CONFIG_SM_LOG_LEVEL);
+
+static const char smp_echo_str[] = "SMP echo";
+
+static struct smp_client_object smp_client;
+static struct os_mgmt_client os_client;
+
+static int sm_smp_client_echo(void)
+{
+	int ret;
+
+	for (int attempt = 1; attempt <= 3; attempt++) {
+		ret = os_mgmt_client_echo(&os_client, smp_echo_str, sizeof(smp_echo_str));
+		if (ret == MGMT_ERR_EOK) {
+			LOG_INF("SMP echo round-trip ok (attempt %d)", attempt);
+			return 0;
+		}
+
+		LOG_WRN("SMP echo attempt %d failed: %d", attempt, ret);
+		k_msleep(500);
+	}
+
+	LOG_ERR("SMP echo failed after retries");
+	return -EIO;
+}
+
+static int sm_smp_client_init(void)
+{
+	int ret;
+
+	ret = smp_client_object_init(&smp_client, SMP_SERIAL_TRANSPORT);
+	if (ret) {
+		LOG_ERR("SMP client init failed: %d", ret);
+		return ret;
+	}
+
+	os_mgmt_client_init(&os_client, &smp_client);
+
+	LOG_INF("SMP echo request: %s", smp_echo_str);
+	return sm_smp_client_echo();
+}
+
+SYS_INIT(sm_smp_client_init, APPLICATION, 95);
diff --git a/samples/sm_fota_smp_srv/CMakeLists.txt b/samples/sm_fota_smp_srv/CMakeLists.txt
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2023 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+cmake_minimum_required(VERSION 3.20.0)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(sm_fota_smp_srv)
+
+target_sources(app PRIVATE src/main.c)
diff --git a/samples/sm_fota_smp_srv/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/sm_fota_smp_srv/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2026 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		/* SMP transport. Console/logs go over SEGGER RTT (see prj.conf), so
+		 * no zephyr,console/shell-uart here — that keeps uart20 (P1.04-07)
+		 * free for the future AT host link.
+		 */
+		zephyr,uart-mcumgr = &uart30;
+	};
+};
+
+&pinctrl {
+	uart30_smp_default: uart30_smp_default {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>;
+		};
+
+		group2 {
+			psels = <NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			bias-pull-up;
+		};
+	};
+
+	uart30_smp_sleep: uart30_smp_sleep {
+		group1 {
+			psels = <NRF_PSEL(UART_TX, 0, 0)>,
+				<NRF_PSEL(UART_RX, 0, 1)>,
+				<NRF_PSEL(UART_RTS, 0, 2)>,
+				<NRF_PSEL(UART_CTS, 0, 3)>;
+			low-power-enable;
+		};
+	};
+};
+
+&uart30 {
+	status = "okay";
+	current-speed = <115200>;
+	hw-flow-control;
+	pinctrl-0 = <&uart30_smp_default>;
+	pinctrl-1 = <&uart30_smp_sleep>;
+	pinctrl-names = "default", "sleep";
+};
+
+/* Console moved to RTT; release uart20 (P1.04-07) for the future AT host link. */
+&uart20 {
+	status = "disabled";
+};
diff --git a/samples/sm_fota_smp_srv/overlay-host-fota.conf b/samples/sm_fota_smp_srv/overlay-host-fota.conf
@@ -0,0 +1,5 @@
+CONFIG_MEMFAULT_FOTA_MODEM_UPDATE=y
+CONFIG_MEMFAULT_FOTA_MODEM_SOFTWARE_TYPE="host"
+
+# Update with a new project key, see https://docs.memfault.com/docs/mcu/nrf-modem-fota
+CONFIG_MEMFAULT_FOTA_MODEM_PROJECT_KEY="YOUR_PROJECT_KEY"
diff --git a/samples/sm_fota_smp_srv/overlay-mfw-app-fota.conf b/samples/sm_fota_smp_srv/overlay-mfw-app-fota.conf
@@ -0,0 +1,5 @@
+CONFIG_MEMFAULT_FOTA_MODEM_UPDATE=y
+CONFIG_MEMFAULT_FOTA_MODEM_SOFTWARE_TYPE="mfw-app"
+
+# Update with a new project key, see https://docs.memfault.com/docs/mcu/nrf-modem-fota
+CONFIG_MEMFAULT_FOTA_MODEM_PROJECT_KEY="YOUR_PROJECT_KEY"
diff --git a/samples/sm_fota_smp_srv/overlay-mfw-fota.conf b/samples/sm_fota_smp_srv/overlay-mfw-fota.conf
@@ -0,0 +1,4 @@
+CONFIG_MEMFAULT_FOTA_MODEM_UPDATE=y
+
+# Update with a new project key, see https://docs.memfault.com/docs/mcu/nrf-modem-fota
+CONFIG_MEMFAULT_FOTA_MODEM_PROJECT_KEY="YOUR_PROJECT_KEY"
diff --git a/samples/sm_fota_smp_srv/prj.conf b/samples/sm_fota_smp_srv/prj.conf
@@ -0,0 +1,39 @@
+# Copyright (c) 2026 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+CONFIG_MAIN_STACK_SIZE=2048
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2304
+
+CONFIG_LOG=y
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_CONSOLE=y
+
+# Console/logs over SEGGER RTT (VCOM is freed for the SMP UART link).
+CONFIG_UART_CONSOLE=n
+CONFIG_LOG_BACKEND_UART=n
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_RTT_CONSOLE=y
+CONFIG_LOG_BACKEND_RTT=y
+
+CONFIG_NET_BUF=y
+CONFIG_ZCBOR=y
+CONFIG_ZCBOR_CANONICAL=y
+CONFIG_CRC=y
+CONFIG_MCUMGR=y
+
+CONFIG_BASE64=y
+CONFIG_UART_MCUMGR=y
+CONFIG_MCUMGR_TRANSPORT_UART=y
+
+# Built-in OS-group echo handler answers the nRF9151 client's
+# os_mgmt_client_echo() round-trip test (it is byte-for-byte compatible with
+# the client encoder, unlike a hand-rolled handler).
+CONFIG_MCUMGR_GRP_OS=y
+CONFIG_MCUMGR_GRP_OS_ECHO=y
+CONFIG_MCUMGR_GRP_OS_TASKSTAT=n
+CONFIG_MCUMGR_GRP_OS_MPSTAT=n
+
+# Notification hooks: emit MGMT_EVT_OP_CMD_RECV when an SMP command arrives so
+# src/main.c can LOG on the server side that the echo round-trip reached it.
+CONFIG_MCUMGR_MGMT_NOTIFICATION_HOOKS=y
+CONFIG_MCUMGR_SMP_COMMAND_STATUS_HOOKS=y
diff --git a/samples/sm_fota_smp_srv/sample.yaml b/samples/sm_fota_smp_srv/sample.yaml
@@ -0,0 +1,10 @@
+sample:
+  name: Serial Modem SMP server
+tests:
+  serial_modem.sm_fota_smp_srv:
+    build_only: true
+    integration_platforms:
+      - nrf54l15dk/nrf54l15/cpuapp
+    platform_allow: nrf54l15dk/nrf54l15/cpuapp
+    tags:
+      - ci_build
diff --git a/samples/sm_fota_smp_srv/src/main.c b/samples/sm_fota_smp_srv/src/main.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/mgmt/mcumgr/mgmt/callbacks.h>
+#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
+#include <zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h>
+
+LOG_MODULE_REGISTER(sm_fota_smp_srv, CONFIG_LOG_DEFAULT_LEVEL);
+
+/*
+ * The actual OS-group echo is serviced by the built-in mcumgr handler
+ * (CONFIG_MCUMGR_GRP_OS_ECHO), which is byte-for-byte compatible with the
+ * nRF9151 client's os_mgmt_client_echo(). We only hook the generic
+ * "command received" notification so the server can LOG on its own console
+ * that the round-trip reached it -- that on-server log is the proof the
+ * client's echo physically arrived and was dispatched.
+ */
+static enum mgmt_cb_return smp_cmd_recv_cb(uint32_t event, enum mgmt_cb_return prev_status,
+					   int32_t *rc, uint16_t *group, bool *abort_more,
+					   void *data, size_t data_size)
+{
+	if (event == MGMT_EVT_OP_CMD_RECV && data != NULL &&
+	    data_size >= sizeof(struct mgmt_evt_op_cmd_arg)) {
+		const struct mgmt_evt_op_cmd_arg *arg = data;
+
+		if (arg->group == MGMT_GROUP_ID_OS && arg->id == OS_MGMT_ID_ECHO) {
+			LOG_INF("SMP echo received from client (OS group, echo command)");
+		} else {
+			LOG_INF("SMP command received: group=%u id=%u", arg->group, arg->id);
+		}
+	}
+
+	return MGMT_CB_OK;
+}
+
+static struct mgmt_callback smp_cmd_recv_callback = {
+	.callback = smp_cmd_recv_cb,
+	.event_id = MGMT_EVT_OP_CMD_RECV,
+};
+
+int main(void)
+{
+	mgmt_callback_register(&smp_cmd_recv_callback);
+
+	LOG_INF("SMP server ready");
+
+	while (true) {
+		k_sleep(K_FOREVER);
+	}
+
+	return 0;
+}
diff --git a/samples/sm_fota_smp_srv/sysbuild.conf b/samples/sm_fota_smp_srv/sysbuild.conf
@@ -0,0 +1,4 @@
+# Copyright (c) 2026 Nordic Semiconductor ASA
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+SB_CONFIG_BOOTLOADER_MCUBOOT=n
