manifest: Upmerge sdk-zephyr and sdk-mcuboot repositories

applications/ipc_radio/src/bt_hci_ipc.c

@@ -170,32 +170,12 @@ static struct net_buf *recv_iso(const uint8_t *data, size_t len)
 
 static void send(struct net_buf *buf, bool is_fatal_err)
 {
-	uint8_t type;
 	uint8_t retries = 0;
 	int ret;
 
-	LOG_DBG("buf %p type %u len %u", buf, bt_buf_get_type(buf), buf->len);
+	LOG_DBG("buf %p type %u len %u", buf, buf->data[0], buf->len);
 	LOG_HEXDUMP_DBG(buf->data, buf->len, "Controller buffer:");
 
-	switch (bt_buf_get_type(buf)) {
-	case BT_BUF_ACL_IN:
-		type = HCI_H4_ACL;
-		break;
-	case BT_BUF_EVT:
-		type = HCI_H4_EVT;
-		break;
-	case BT_BUF_ISO_IN:
-		type = HCI_H4_ISO;
-		break;
-	default:
-		LOG_ERR("Unknown type %u", bt_buf_get_type(buf));
-		net_buf_unref(buf);
-		return;
-	}
-	net_buf_push_u8(buf, type);
-
-	LOG_HEXDUMP_DBG(buf->data, buf->len, "Final HCI buffer:");
-
 	do {
 		ret = ipc_service_send(&hci_ept, buf->data, buf->len);
 		if (ret < 0) {

applications/nrf5340_audio/broadcast_sink/main.c

@@ -36,11 +36,6 @@ struct ble_iso_data {
 
 static uint32_t last_broadcast_id = BRDCAST_ID_NOT_USED;
 
-static struct zbus_observer_node zbus_obs_node_button;
-static struct zbus_observer_node zbus_obs_node_audio;
-static struct zbus_observer_node zbus_obs_node_volume;
-static struct zbus_observer_node zbus_obs_node_mgmt;
-
 ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
 
 ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -465,31 +460,27 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add button sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");
 		return ret;
 	}
 
 	if (IS_ENABLED(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP)) {
-		ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume,
-					ZBUS_ADD_OBS_TIMEOUT_MS);
+		ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 		if (ret) {
 			LOG_ERR("Failed to add add volume sub");
 			return ret;
 		}
 	}
 
-	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, &zbus_obs_node_mgmt,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt sub");
 		return ret;

applications/nrf5340_audio/broadcast_source/main.c

@@ -25,11 +25,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
 
-static struct zbus_observer_node zbus_obs_node_ref;
-static struct zbus_observer_node zbus_obs_node_button;
-static struct zbus_observer_node zbus_obs_node_audio;
-static struct zbus_observer_node zbus_obs_node_mgmt;
-
 ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
 
 ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -277,8 +272,7 @@ static int zbus_subscribers_create(void)
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_ref,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add timestamp listener");
 		return ret;
@@ -336,22 +330,19 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add button sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt listener");
 		return ret;

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c

@@ -53,15 +53,15 @@ static const uint8_t cap_adv_data[] = {
 #if defined(CONFIG_BT_AUDIO_RX)
 #define AVAILABLE_SINK_CONTEXT (BT_AUDIO_CONTEXT_TYPE_ANY)
 #else
-#define AVAILABLE_SINK_CONTEXT BT_AUDIO_CONTEXT_TYPE_PROHIBITED
+#define AVAILABLE_SINK_CONTEXT BT_AUDIO_CONTEXT_TYPE_NONE
 #endif /* CONFIG_BT_AUDIO_RX */
 
 static struct bt_cap_stream *cap_tx_streams[CONFIG_BT_ASCS_MAX_ASE_SRC_COUNT];
 
 #if defined(CONFIG_BT_AUDIO_TX)
 #define AVAILABLE_SOURCE_CONTEXT (BT_AUDIO_CONTEXT_TYPE_ANY)
 #else
-#define AVAILABLE_SOURCE_CONTEXT BT_AUDIO_CONTEXT_TYPE_PROHIBITED
+#define AVAILABLE_SOURCE_CONTEXT BT_AUDIO_CONTEXT_TYPE_NONE
 #endif /* CONFIG_BT_AUDIO_TX */
 
 static struct bt_bap_unicast_server_register_param unicast_server_params = {

applications/nrf5340_audio/unicast_client/main.c

@@ -29,12 +29,6 @@ LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
 
 static enum stream_state strm_state = STATE_PAUSED;
 
-static struct zbus_observer_node zbus_obs_node_sdu;
-static struct zbus_observer_node zbus_obs_node_button;
-static struct zbus_observer_node zbus_obs_node_audio;
-static struct zbus_observer_node zbus_obs_node_media;
-static struct zbus_observer_node zbus_obs_node_mgmt;
-
 ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
 ZBUS_SUBSCRIBER_DEFINE(content_control_evt_sub, CONFIG_CONTENT_CONTROL_MSG_SUB_QUEUE_SIZE);
 
@@ -475,8 +469,7 @@ static int zbus_subscribers_create(void)
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_sdu,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add timestamp listener");
 		return ret;
@@ -498,29 +491,26 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add button sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt listener");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&cont_media_chan, &content_control_evt_sub, &zbus_obs_node_media,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&cont_media_chan, &content_control_evt_sub,
+		ZBUS_ADD_OBS_TIMEOUT_MS);
 
 	return 0;
 }

applications/nrf5340_audio/unicast_server/main.c

@@ -29,11 +29,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
 
-static struct zbus_observer_node zbus_obs_node_button;
-static struct zbus_observer_node zbus_obs_node_audio;
-static struct zbus_observer_node zbus_obs_node_volume;
-static struct zbus_observer_node zbus_obs_node_mgmt;
-
 ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
 
 ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -403,30 +398,26 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add button sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
-				ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt sub");
 		return ret;
 	}
 
 	if (IS_ENABLED(CONFIG_BOARD_NRF5340_AUDIO_DK_NRF5340_CPUAPP)) {
-		ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume,
-					ZBUS_ADD_OBS_TIMEOUT_MS);
+		ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
 		if (ret) {
 			LOG_ERR("Failed to add volume sub");
 			return ret;

applications/serial_lte_modem/src/http_c/slm_at_httpc.c

@@ -74,9 +74,9 @@ static K_THREAD_STACK_DEFINE(httpc_thread_stack, HTTPC_THREAD_STACK_SIZE);
 
 static K_SEM_DEFINE(http_req_sem, 0, 1);
 
-static void response_cb(struct http_response *rsp,
-			enum http_final_call final_data,
-			void *user_data)
+static int response_cb(struct http_response *rsp,
+		       enum http_final_call final_data,
+		       void *user_data)
 {
 	ARG_UNUSED(user_data);
 
@@ -114,6 +114,8 @@ static void response_cb(struct http_response *rsp,
 		httpc.state = HTTPC_COMPLETE;
 	}
 	LOG_DBG("Response data received (%zd bytes)", rsp->data_len);
+
+	return 0;
 }
 
 static int headers_cb(int sock, struct http_request *req, void *user_data)

boards/nordic/thingy91x/thingy91x_common.dtsi

@@ -60,7 +60,7 @@
 			reg_3v3: BUCK2 {
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
-				enable-gpios = <&gpios_pmic 2 GPIO_ACTIVE_HIGH>;
+				enable-gpio-config = <2 GPIO_ACTIVE_HIGH>;
 			};
 			/* LDO1 is used as a load switch pulling the nPM6001 enable line to VSYS */
 			ldsw_nPM6001_en: LDO1 {

boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dts

@@ -131,7 +131,7 @@
 
 /* Include default memory partition configuration file. */
 /* This is not the layout that's actually used! It's overridden by Partition Manager. */
-#include <common/nordic/nrf5340_cpuapp_partition.dtsi>
+#include <vendor/nordic/nrf5340_cpuapp_partition.dtsi>
 
 &ieee802154 {
 	status = "okay";

boards/nordic/thingy91x/thingy91x_nrf5340_cpunet.dts

@@ -82,4 +82,4 @@
 };
 
 /* Include default shared RAM configuration file */
-#include <common/nordic/nrf5340_shared_sram_partition.dtsi>
+#include <vendor/nordic/nrf5340_shared_sram_partition.dtsi>

boards/nordic/thingy91x/thingy91x_nrf9151_common.dts

@@ -179,4 +179,4 @@
 
 /* Include default memory partition configuration file. */
 /* This is not the layout that's actually used! It's overridden by Partition Manager. */
-#include <common/nordic/nrf91xx_partition.dtsi>
+#include <vendor/nordic/nrf91xx_partition.dtsi>

doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_custom_pcb.rst

@@ -41,7 +41,7 @@ See the following documentation pages for more information:
 * The :ref:`dm_adding_code` documentation for details on the best user workflows to add your own code to the |NCS|.
 
 .. note::
-   The configuration of board files is based on the nRF54H20 common SoC files located in :file:`sdk-zephyr/dts/common/nordic/`.
+   The configuration of board files is based on the nRF54H20 common SoC files located in :file:`sdk-zephyr/dts/vendor/nordic/`.
    Each new |NCS| revision might change these files, breaking the compatibility with your custom board files created for previous revisions.
    Ensure the compatibility of your custom board files when migrating to a new |NCS| release.
 

doc/zephyr/zephyr.doxyfile.in

@@ -979,7 +979,8 @@ INPUT                  = @DOCSET_SOURCE_BASE@/doc/_doxygen/mainpage.md \
                          @DOCSET_SOURCE_BASE@/lib/libc/minimal/include/ \
                          @DOCSET_SOURCE_BASE@/subsys/testsuite/include/ \
                          @DOCSET_SOURCE_BASE@/subsys/testsuite/ztest/include/ \
-                         @DOCSET_SOURCE_BASE@/subsys/secure_storage/include/
+                         @DOCSET_SOURCE_BASE@/subsys/secure_storage/include/ \
+                         @DOCSET_SOURCE_BASE@/modules/openthread/include/openthread.h \
 
 # This tag can be used to specify the character encoding of the source files
 # that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses

drivers/flash/flash_rpc/flash_rpc_common.c

@@ -31,4 +31,4 @@ static int serialization_init(void)
 	return 0;
 }
 
-SYS_INIT(serialization_init, POST_KERNEL, CONFIG_FLASH_RPC_SYS_INIT_PRIORITY);
+SYS_INIT(serialization_init, APPLICATION, CONFIG_FLASH_RPC_SYS_INIT_PRIORITY);

drivers/flash/flash_rpc/flash_rpc_controller.c

@@ -231,3 +231,18 @@ static const struct flash_driver_api flash_driver_rpc_api = {
 
 DEVICE_DT_INST_DEFINE(0, flash_rpc_init, NULL, NULL, NULL, POST_KERNEL,
 		      CONFIG_FLASH_RPC_DRIVER_INIT_PRIORITY, &flash_driver_rpc_api);
+
+static int controller_init(void)
+{
+	int err;
+
+	err = device_init(DEVICE_DT_GET(DT_NODELABEL(rpc_flash_controller)));
+	if (err != 0) {
+		LOG_ERR("Flash RPC controller initialization failed, err %d", err);
+		return err;
+	}
+
+	return 0;
+}
+
+SYS_INIT(controller_init, APPLICATION, CONFIG_FLASH_RPC_DRIVER_INIT_PRIORITY);

dts/bindings/flash/nordic,rpc-flash-controller.yaml

@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Nordic Semiconductor
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+
+description: Flash RPC controller
+
+compatible: "nordic,rpc-flash-controller"
+
+include: flash-controller.yaml

dts/common/nordic/nrf54lm20a.dtsi

@@ -147,6 +147,7 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 				status = "disabled";
+				enable-secure;
 
 				cpuflpr_clic: interrupt-controller@f0000000 {
 					compatible = "nordic,nrf-clic";

dts/common/nordic/nrf54lv10a.dtsi

@@ -147,6 +147,7 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 				status = "disabled";
+				enable-secure;
 
 				cpuflpr_clic: interrupt-controller@f0000000 {
 					compatible = "nordic,nrf-clic";

include/net/rest_client.h

@@ -141,6 +141,9 @@ struct rest_client_resp_context {
 
 	/** True if used_socket_id was kept alive and was not closed after the REST request. */
 	int used_socket_is_alive;
+
+	/** A pointer to the request context associated with the response. */
+	struct rest_client_req_context *req_ctx;
 };
 
 /**

modules/openthread/CMakeLists.txt

@@ -274,6 +274,15 @@ target_link_libraries(zephyr PRIVATE ${ot_libs})
 
 endif()
 
+# Create a library for the OpenThread Zephyr utils
+zephyr_library_named(openthread_utils)
+zephyr_library_sources(
+  ${ZEPHYR_BASE}/modules/openthread/openthread.c
+  ${ZEPHYR_BASE}/modules/openthread/openthread_utils.c
+)
+zephyr_library_sources_ifdef(CONFIG_OPENTHREAD_SHELL ${ZEPHYR_BASE}/modules/openthread/shell.c)
+zephyr_include_directories(${ZEPHYR_BASE}/modules/openthread/include)
+
 add_subdirectory(platform)
 
 endif()