From b304b14315adab74592618cc207635bae528ebf2 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Wed, 13 Aug 2025 16:02:05 +0300 Subject: [PATCH 01/46] manifest: Upmerge sdk-zephyr, sdk-mbedtls and sdk-mcuboot Regular upmerge. Signed-off-by: Jukka Rissanen --- west.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/west.yml b/west.yml index 0f482e102622..94f6a5c12079 100644 --- a/west.yml +++ b/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: 7d3bd3993600d433ab0653391aee2fa2b4ce3fda + revision: pull/3178/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: c39029507179e3e1707eb46ca002a0780bb5b5b4 + revision: pull/513/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -137,7 +137,7 @@ manifest: - name: mbedtls path: modules/crypto/mbedtls repo-path: sdk-mbedtls - revision: c5115abac477249fab42e61368b8f87c3c9265e1 + revision: pull/44/head - name: oberon-psa-crypto path: modules/crypto/oberon-psa-crypto repo-path: sdk-oberon-psa-crypto From f6c6ea45f188f77b85dab630ec70b56a493c67f9 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Tue, 9 Sep 2025 16:36:58 +0200 Subject: [PATCH 02/46] boards: Remove usage of deprecated BT_CTLR Kconfig option Use HAS_BT_CTLR instead of the deprecated BT_CTLR. Relates to zephyrproject-rtos/zephyr#94287 Signed-off-by: Vinayak Kariappa Chettimada --- applications/connectivity_bridge/sysbuild/mcuboot/prj.conf | 1 - applications/machine_learning/sysbuild/mcuboot/prj.conf | 1 - applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf | 1 - applications/serial_lte_modem/sysbuild/mcuboot/prj.conf | 1 - boards/nordic/nrf54lv10dk/Kconfig.defconfig | 2 +- boards/nordic/nrf7120pdk/Kconfig.defconfig | 4 ++-- samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf | 1 - samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf | 1 - samples/cellular/lte_ble_gateway/prj.conf | 1 - .../nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf | 1 - .../cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf | 1 - samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf | 1 - samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt | 2 +- samples/net/aws_iot/sysbuild/mcuboot/prj.conf | 1 - samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf | 1 - samples/net/https_client/sysbuild/mcuboot/prj.conf | 1 - samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf | 1 - .../extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf | 1 - .../sysbuild/mcuboot/prj_no_network_core_directxip.conf | 1 - samples/wifi/shell/sysbuild/mcuboot/prj.conf | 1 - .../decompression/mcuboot_update/sysbuild/mcuboot/prj.conf | 1 - 21 files changed, 4 insertions(+), 22 deletions(-) diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf index de88dbd229eb..5a57331d5789 100644 --- a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf +++ b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf index 1bdee3845ce4..d762bb27bdc0 100644 --- a/applications/machine_learning/sysbuild/mcuboot/prj.conf +++ b/applications/machine_learning/sysbuild/mcuboot/prj.conf @@ -29,7 +29,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf index ac2e241ee039..378fc5af17a5 100644 --- a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf +++ b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf @@ -27,7 +27,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf index 1c0a3bc2438f..0811a1162e4a 100644 --- a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf +++ b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/boards/nordic/nrf54lv10dk/Kconfig.defconfig b/boards/nordic/nrf54lv10dk/Kconfig.defconfig index 2b34c4881afc..f8264c25282e 100644 --- a/boards/nordic/nrf54lv10dk/Kconfig.defconfig +++ b/boards/nordic/nrf54lv10dk/Kconfig.defconfig @@ -5,7 +5,7 @@ DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -config BT_CTLR +config HAS_BT_CTLR default BT config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE diff --git a/boards/nordic/nrf7120pdk/Kconfig.defconfig b/boards/nordic/nrf7120pdk/Kconfig.defconfig index 8d0e2a796283..e472f4f0b5cf 100644 --- a/boards/nordic/nrf7120pdk/Kconfig.defconfig +++ b/boards/nordic/nrf7120pdk/Kconfig.defconfig @@ -3,7 +3,7 @@ if BOARD_NRF7120PDK_NRF7120_CPUAPP -config BT_CTLR +config HAS_BT_CTLR default BT config ROM_START_OFFSET @@ -14,7 +14,7 @@ endif # BOARD_NRF7120PDK_NRF7120_CPUAPP if BOARD_NRF7120PDK_NRF7120_CPUAPP_NS -config BT_CTLR +config HAS_BT_CTLR default BT # By default, if we build for a Non-Secure version of the board, diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf index 41a76acf2081..5eb10bc12062 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf b/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf index 137bb57531be..d47a160e233d 100644 --- a/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/lte_ble_gateway/prj.conf b/samples/cellular/lte_ble_gateway/prj.conf index bcaf435416bb..f80c0f8a7a23 100644 --- a/samples/cellular/lte_ble_gateway/prj.conf +++ b/samples/cellular/lte_ble_gateway/prj.conf @@ -55,7 +55,6 @@ CONFIG_CONSOLE_GETCHAR=y # Enable Bluetooth stack and libraries CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=n CONFIG_BT_WAIT_NOP=y CONFIG_BT_CENTRAL=y CONFIG_BT_GATT_CLIENT=y diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf index 41a76acf2081..5eb10bc12062 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf index 7515f3cbd3a6..46e6cc3c0141 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf index bfd2a6e11956..61432be3b7a0 100644 --- a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf @@ -21,7 +21,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt b/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt index 1ef975a7dd1a..13afc6eb6d77 100644 --- a/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt +++ b/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt @@ -6,7 +6,7 @@ if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_VALIDATION) - if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP AND CONFIG_BT_CTLR) + if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP AND CONFIG_HAS_BT_CTLR) if ((NOT (CONFIG_BT_BUF_ACL_TX_SIZE EQUAL 251)) OR (NOT (CONFIG_BT_BUF_ACL_RX_SIZE EQUAL 502)) OR (NOT (CONFIG_BT_CTLR_DATA_LENGTH_MAX EQUAL 251)) diff --git a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf index fb07827136b9..4943e831d2d6 100644 --- a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf +++ b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf @@ -29,7 +29,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set # CONFIG_LOG=y diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf index 41a76acf2081..5eb10bc12062 100644 --- a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/net/https_client/sysbuild/mcuboot/prj.conf b/samples/net/https_client/sysbuild/mcuboot/prj.conf index 137bb57531be..d47a160e233d 100644 --- a/samples/net/https_client/sysbuild/mcuboot/prj.conf +++ b/samples/net/https_client/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf index 8fb46597374d..2e8613b74cfe 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf index 62f90733eb0a..70d5772115be 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf index 62f90733eb0a..70d5772115be 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/wifi/shell/sysbuild/mcuboot/prj.conf b/samples/wifi/shell/sysbuild/mcuboot/prj.conf index 04f385356e12..e81dce54d761 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/prj.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/prj.conf @@ -29,7 +29,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf index 5e0496c33ae4..882343826068 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf @@ -23,7 +23,6 @@ CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y From a5c626457d49279373e5ecb788a0cd27e6a7d8b7 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Tue, 9 Sep 2025 17:04:09 +0200 Subject: [PATCH 03/46] samples: openthread: Switch to new USB driver In Zephyr the current USB driver used in CLI and coprocessor samples has been deprecated, and we need to switch to the new usbd one. Signed-off-by: Arkadiusz Balys --- samples/openthread/cli/snippets/usb/usb.conf | 14 +++++++------- samples/openthread/cli/src/main.c | 7 ------- .../openthread/coprocessor/snippets/usb/usb.conf | 13 ++++++------- samples/openthread/coprocessor/src/rcp_hci.c | 2 -- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/samples/openthread/cli/snippets/usb/usb.conf b/samples/openthread/cli/snippets/usb/usb.conf index 7e6d32c1e164..f84c63d80f49 100644 --- a/samples/openthread/cli/snippets/usb/usb.conf +++ b/samples/openthread/cli/snippets/usb/usb.conf @@ -8,11 +8,11 @@ CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y -CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y +CONFIG_USBD_CDC_ACM_LOG_LEVEL_OFF=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="Thread CLI" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x0000 +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thread CLI" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x0000 diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c index c169cbcefbcd..f3e29aaebc92 100644 --- a/samples/openthread/cli/src/main.c +++ b/samples/openthread/cli/src/main.c @@ -16,7 +16,6 @@ #endif #include -#include LOG_MODULE_REGISTER(cli_sample, CONFIG_OT_COMMAND_LINE_INTERFACE_LOG_LEVEL); @@ -37,12 +36,6 @@ int main(void) const struct device *dev; uint32_t dtr = 0U; - ret = usb_enable(NULL); - if (ret != 0 && ret != -EALREADY) { - LOG_ERR("Failed to enable USB"); - return 0; - } - dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart)); if (dev == NULL) { LOG_ERR("Failed to find specific UART device"); diff --git a/samples/openthread/coprocessor/snippets/usb/usb.conf b/samples/openthread/coprocessor/snippets/usb/usb.conf index c7cac6bb7b84..5b1d8c715808 100644 --- a/samples/openthread/coprocessor/snippets/usb/usb.conf +++ b/samples/openthread/coprocessor/snippets/usb/usb.conf @@ -4,12 +4,11 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_USB_CDC_ACM=y -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x0000 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thread Co-Processor" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x0000 CONFIG_UART_LINE_CTRL=y diff --git a/samples/openthread/coprocessor/src/rcp_hci.c b/samples/openthread/coprocessor/src/rcp_hci.c index 3d721f445d5b..85a0af07fc1c 100644 --- a/samples/openthread/coprocessor/src/rcp_hci.c +++ b/samples/openthread/coprocessor/src/rcp_hci.c @@ -17,8 +17,6 @@ #include #include -#include - #include #include #include From 98878bb6f1676628adf441e3967835a331979ec0 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Tue, 9 Sep 2025 17:18:33 +0200 Subject: [PATCH 04/46] samples: net: mqtt: Align with SMF API changes The state_execution() function signature changed. Signed-off-by: Robert Lubos --- samples/net/mqtt/src/modules/transport/transport.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/samples/net/mqtt/src/modules/transport/transport.c b/samples/net/mqtt/src/modules/transport/transport.c index 8a76879bb559..68cf5e51ee78 100644 --- a/samples/net/mqtt/src/modules/transport/transport.c +++ b/samples/net/mqtt/src/modules/transport/transport.c @@ -270,7 +270,7 @@ static void disconnected_entry(void *o) } /* Function executed when the module is in the disconnected state. */ -static void disconnected_run(void *o) +static enum smf_state_result disconnected_run(void *o) { struct s_object *user_object = o; @@ -289,6 +289,8 @@ static void disconnected_run(void *o) */ k_work_reschedule_for_queue(&transport_queue, &connect_work, K_SECONDS(5)); } + + return SMF_EVENT_HANDLED; } /* Function executed when the module enters the connected state. */ @@ -309,7 +311,7 @@ static void connected_entry(void *o) } /* Function executed when the module is in the connected state. */ -static void connected_run(void *o) +static enum smf_state_result connected_run(void *o) { struct s_object *user_object = o; @@ -319,14 +321,16 @@ static void connected_run(void *o) * The call to this function will cause on_mqtt_disconnect() to be called. */ (void)mqtt_helper_disconnect(); - return; + return SMF_EVENT_HANDLED; } if (user_object->chan != &PAYLOAD_CHAN) { - return; + return SMF_EVENT_HANDLED; } publish(&user_object->payload); + + return SMF_EVENT_HANDLED; } /* Function executed when the module exits the connected state. */ From 1c035beaecfc789dbac42281bea19a1ce7fddcfe Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Thu, 11 Sep 2025 13:46:30 +0200 Subject: [PATCH 05/46] samples: openthread: Align coprocessor HCI to new USB stack We need to provide some alignments to the Coprocessor sample after switching to the new USB stack. Signed-off-by: Arkadiusz Balys --- samples/openthread/coprocessor/sample.yaml | 2 +- .../coprocessor/snippets/hci/rcp_hci.conf | 13 ++++++------- samples/openthread/coprocessor/src/rcp_hci.c | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 1cf94b14b0c3..822fd30c03b3 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -102,7 +102,7 @@ tests: - nrf54lm20dk/nrf54lm20a/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns extra_args: - - cli_SNIPPET="ci;l2" + - coprocessor_SNIPPET="ci;l2" integration_platforms: - nrf52840dk/nrf52840 - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf b/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf index ae78427c5881..5d2307037f9d 100644 --- a/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf +++ b/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf @@ -24,12 +24,11 @@ CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255 # Host number of completed commands does not follow normal flow control. CONFIG_BT_BUF_CMD_TX_COUNT=10 -CONFIG_USB_CDC_ACM=y -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor with BLE HCI" -CONFIG_USB_DEVICE_VID=0xCAFD -CONFIG_USB_DEVICE_PID=0x0000 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thread Co-Processor" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x0000 CONFIG_UART_LINE_CTRL=y diff --git a/samples/openthread/coprocessor/src/rcp_hci.c b/samples/openthread/coprocessor/src/rcp_hci.c index 85a0af07fc1c..cf13233e0f24 100644 --- a/samples/openthread/coprocessor/src/rcp_hci.c +++ b/samples/openthread/coprocessor/src/rcp_hci.c @@ -24,6 +24,8 @@ #include #include +#include + LOG_MODULE_REGISTER(rcp_hci_module, CONFIG_OT_COPROCESSOR_LOG_LEVEL); static const struct device *const hci_uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_c2h_uart)); From 1fdbfe298e79c0deb6883848dfc776250413f6dc Mon Sep 17 00:00:00 2001 From: Tommi Kangas Date: Thu, 11 Sep 2025 15:55:59 +0300 Subject: [PATCH 06/46] treewide: Remove use of CONFIG_DEBUG_INFO CONFIG_DEBUG_INFO has been renamed to CONFIG_X86_DEBUG_INFO. It is an X86 specific option and should never have been used. Signed-off-by: Tommi Kangas --- .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf | 1 - .../ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf | 1 - .../sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf | 1 - applications/machine_learning/sysbuild/ipc_radio/prj.conf | 1 - applications/matter_bridge/sysbuild/ipc_radio/prj.conf | 1 - applications/matter_weather_station/sysbuild/ipc_radio/prj.conf | 1 - applications/nrf5340_audio/prj.conf | 1 - applications/nrf5340_audio/prj_fota.conf | 1 - samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf | 1 - samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf | 1 - samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf | 1 - samples/bluetooth/nrf_auraconfig/prj.conf | 1 - .../peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf | 1 - .../bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf | 1 - samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf | 1 - .../peripheral_power_profiling/sysbuild/ipc_radio/prj.conf | 1 - .../sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf | 1 - samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf | 1 - .../sysbuild/ipc_radio/prj.conf | 1 - .../scanning_while_connecting/sysbuild/ipc_radio/prj.conf | 1 - samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf | 1 - samples/cellular/modem_shell/prj.conf | 1 - samples/dect/dect_phy/dect_shell/prj.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - .../lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf | 1 - .../lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - .../ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf | 1 - .../sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf | 1 - samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf | 1 - samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf | 1 - samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf | 1 - tests/bluetooth/bsim/nrf_auraconfig/prj.conf | 1 - .../bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf | 1 - 49 files changed, 49 deletions(-) diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index ead9d77c741c..f19e2762bade 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -12,7 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_MAX_CONN=6 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/prj.conf b/applications/machine_learning/sysbuild/ipc_radio/prj.conf index 2a081a6896e0..a57e1eccccb2 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/prj.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/prj.conf @@ -16,7 +16,6 @@ CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf index dedd0c2f61a6..f73b695a909a 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf @@ -29,7 +29,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf index cd698e9029a5..92716ca1df9e 100644 --- a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf @@ -35,7 +35,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf index 627d25ffa1a1..ec4855ec61a3 100644 --- a/applications/nrf5340_audio/prj.conf +++ b/applications/nrf5340_audio/prj.conf @@ -11,7 +11,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y # General CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/applications/nrf5340_audio/prj_fota.conf b/applications/nrf5340_audio/prj_fota.conf index db5980075acf..13ad6ca274d0 100644 --- a/applications/nrf5340_audio/prj_fota.conf +++ b/applications/nrf5340_audio/prj_fota.conf @@ -12,7 +12,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y # General CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf index 97c2ce32264a..389ad37e59f8 100644 --- a/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf @@ -22,7 +22,6 @@ CONFIG_BT_CTLR_PHY_CODED=y CONFIG_BT_EXT_ADV_CODING_SELECTION=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf index 0df07621e6db..ac34baa24930 100644 --- a/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf index f64686af27e1..45b2a9cb2008 100644 --- a/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_CTLR_ADV_SET=2 CONFIG_BT_CTLR_ADV_EXT=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/nrf_auraconfig/prj.conf b/samples/bluetooth/nrf_auraconfig/prj.conf index 39c370ab770a..b15cbed9265e 100644 --- a/samples/bluetooth/nrf_auraconfig/prj.conf +++ b/samples/bluetooth/nrf_auraconfig/prj.conf @@ -7,7 +7,6 @@ # General CONFIG_REBOOT=y CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf index 80ac771b2a71..a94d5c5ecb73 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_MAX_CONN=2 CONFIG_BT_CENTRAL=n CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf index b288cf3c93a9..bc8c9369809d 100644 --- a/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf @@ -5,7 +5,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_BT=y diff --git a/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf index 3a956da37281..10fac7b05bdf 100644 --- a/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf @@ -24,7 +24,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf index f09dd696bd0f..9b6ebfafcd66 100644 --- a/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_PHY_CODED=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf index f66cb06cdd0b..30ee7ffa8bf4 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf @@ -22,7 +22,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf index 802ba7cb25ec..83eef015f4f0 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf @@ -17,7 +17,6 @@ CONFIG_BT_MAX_CONN=16 # CONFIG_BT_BUF_CMD_TX_SIZE=255 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf index ab6e84349d84..92a707c20844 100644 --- a/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf @@ -5,7 +5,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_BT=y diff --git a/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf index 538983a5fb9b..1fad06d9b425 100644 --- a/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf @@ -5,7 +5,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_BT=y diff --git a/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf index 76b72aa9c3b0..1d9d27ebe1df 100644 --- a/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf @@ -25,7 +25,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/cellular/modem_shell/prj.conf b/samples/cellular/modem_shell/prj.conf index 06180293e503..3bda9c750dc8 100644 --- a/samples/cellular/modem_shell/prj.conf +++ b/samples/cellular/modem_shell/prj.conf @@ -159,7 +159,6 @@ CONFIG_ASSERT=y CONFIG_LOG=y # Keep printk() synchronous CONFIG_LOG_PRINTK=n -CONFIG_DEBUG_INFO=y #CONFIG_DEBUG_OPTIMIZATIONS=y #CONFIG_NO_OPTIMIZATIONS=y #CONFIG_FORCE_NO_ASSERT=y diff --git a/samples/dect/dect_phy/dect_shell/prj.conf b/samples/dect/dect_phy/dect_shell/prj.conf index 856c3d22fbd0..94c5e09deee7 100644 --- a/samples/dect/dect_phy/dect_shell/prj.conf +++ b/samples/dect/dect_phy/dect_shell/prj.conf @@ -78,7 +78,6 @@ CONFIG_LOG=y CONFIG_PRINTK=y CONFIG_LOG_PRINTK=n -CONFIG_DEBUG_INFO=y #CONFIG_DEBUG_OPTIMIZATIONS=y #CONFIG_NO_OPTIMIZATIONS=y #CONFIG_FORCE_NO_ASSERT=y diff --git a/samples/matter/contact_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/contact_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 8476b1077adc..d8bd22a3ca1a 100644 --- a/samples/matter/contact_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/contact_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf index cc6e788f8684..8db73dce6d00 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 8476b1077adc..d8bd22a3ca1a 100644 --- a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 5df075031318..c3fc7b02051a 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 8476b1077adc..d8bd22a3ca1a 100644 --- a/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf b/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf index 0390bce97567..4e5316fda470 100644 --- a/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf +++ b/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf @@ -22,7 +22,6 @@ CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y diff --git a/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf b/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf index 2db76a00c55a..8f3b2548ef62 100644 --- a/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf +++ b/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf @@ -22,7 +22,6 @@ CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y diff --git a/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf b/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf index a54ac9e71052..c819ff23f2bd 100644 --- a/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf +++ b/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf @@ -26,7 +26,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_IPC_RADIO_BT=y CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/tests/bluetooth/bsim/nrf_auraconfig/prj.conf b/tests/bluetooth/bsim/nrf_auraconfig/prj.conf index bc76f8487071..2c1581bdb3c3 100644 --- a/tests/bluetooth/bsim/nrf_auraconfig/prj.conf +++ b/tests/bluetooth/bsim/nrf_auraconfig/prj.conf @@ -8,7 +8,6 @@ # General CONFIG_REBOOT=y CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf b/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf index 3899ab7c72df..ebb081af3839 100644 --- a/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf +++ b/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf @@ -26,7 +26,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y From 3f1f3b6fd3f1de67d6ec78218fd71b79d9a1e76e Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Thu, 11 Sep 2025 15:06:52 +0200 Subject: [PATCH 07/46] samples: bluetooth: llpm: remove nrf52840dongle USB configuration nrf52840dongle uses CDC ACM serial backend by default. Disable logging as is not used in the sample. Signed-off-by: Johann Fischer --- .../llpm/boards/nrf52840dongle_nrf52840.conf | 11 ++--------- .../llpm/boards/nrf52840dongle_nrf52840.overlay | 17 ----------------- samples/bluetooth/llpm/src/main.c | 10 +--------- 3 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf index 494465dd5198..d16ed90f0bf2 100644 --- a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf +++ b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf @@ -1,12 +1,5 @@ -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n -CONFIG_USB_DEVICE_PRODUCT="LLPM sample console" -CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="LLPM sample console" +CONFIG_LOG=n CONFIG_UART_CONSOLE=y -CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y - -# Since the default LOG_MODE_MINIMAL is synchronous, it will mess with the USB -# driver/subsys. Use the deferred mode instead. -CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay deleted file mode 100644 index acf3f4a3d20b..000000000000 --- a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,console = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc_acm_uart0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c index 3d321848b45a..559c0f124564 100644 --- a/samples/bluetooth/llpm/src/main.c +++ b/samples/bluetooth/llpm/src/main.c @@ -9,11 +9,7 @@ #include #include -#if defined(CONFIG_USB_DEVICE_STACK) -#include #include -#endif - #include #include #include @@ -426,14 +422,10 @@ int main(void) { int err; -#if defined(CONFIG_USB_DEVICE_STACK) +#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart) const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console)); uint32_t dtr = 0; - if (usb_enable(NULL)) { - return 0; - } - /* Poll if the DTR flag was set, optional */ while (!dtr) { uart_line_ctrl_get(uart_dev, UART_LINE_CTRL_DTR, &dtr); From 15c8588883dd7a2f27457e581ab7061feb454fea Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Thu, 11 Sep 2025 17:23:51 +0200 Subject: [PATCH 08/46] samples: bluetooth: peripheral_uart: use CDC ACM serial backend Use CDC ACM serial backend from the new USB device support. There seems to be an issue with the sample that it does not always work and crashes somewhere between UART configuration and Bluetooth initialization. Signed-off-by: Johann Fischer --- samples/bluetooth/peripheral_uart/prj_cdc.conf | 8 ++++---- samples/bluetooth/peripheral_uart/src/main.c | 9 --------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/samples/bluetooth/peripheral_uart/prj_cdc.conf b/samples/bluetooth/peripheral_uart/prj_cdc.conf index 858feb5f5d31..3a02a3fc5ba7 100644 --- a/samples/bluetooth/peripheral_uart/prj_cdc.conf +++ b/samples/bluetooth/peripheral_uart/prj_cdc.conf @@ -8,10 +8,10 @@ CONFIG_UART_LINE_CTRL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_ASYNC_ADAPTER=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n -CONFIG_USB_CDC_ACM=y -CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y + +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_USBD_CDC_ACM_LOG_LEVEL_OFF=y # Disable the UARTE0 enabled in default project configuration CONFIG_NRFX_UARTE0=n diff --git a/samples/bluetooth/peripheral_uart/src/main.c b/samples/bluetooth/peripheral_uart/src/main.c index 6d9b94226c2e..e9d535c112df 100644 --- a/samples/bluetooth/peripheral_uart/src/main.c +++ b/samples/bluetooth/peripheral_uart/src/main.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -243,14 +242,6 @@ static int uart_init(void) return -ENODEV; } - if (IS_ENABLED(CONFIG_USB_DEVICE_STACK)) { - err = usb_enable(NULL); - if (err && (err != -EALREADY)) { - LOG_ERR("Failed to enable USB"); - return err; - } - } - rx = k_malloc(sizeof(*rx)); if (rx) { rx->len = 0; From 776dbf4f53dcf32210b6dec69300eee5a034cb1c Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Thu, 11 Sep 2025 18:14:18 +0200 Subject: [PATCH 09/46] samples: nrf5340: remote_shell: use CDC ACM serial backend Use CDC ACM serial backend from the new USB device support. Signed-off-by: Johann Fischer --- samples/nrf5340/remote_shell/prj.conf | 14 ++++++++------ samples/nrf5340/remote_shell/src/main.c | 9 --------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/samples/nrf5340/remote_shell/prj.conf b/samples/nrf5340/remote_shell/prj.conf index d9cc289a4a67..f1be5985c1fa 100644 --- a/samples/nrf5340/remote_shell/prj.conf +++ b/samples/nrf5340/remote_shell/prj.conf @@ -7,15 +7,17 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic Remote Shell sample" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x53AA CONFIG_LOG=y -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_LOG_LEVEL_ERR=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/samples/nrf5340/remote_shell/src/main.c b/samples/nrf5340/remote_shell/src/main.c index b7ad0b73cc74..7d238453c538 100644 --- a/samples/nrf5340/remote_shell/src/main.c +++ b/samples/nrf5340/remote_shell/src/main.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "shell_ipc_host.h" @@ -139,14 +138,6 @@ int main(void) return 0; } - if (IS_ENABLED(CONFIG_USB_DEVICE_STACK)) { - err = usb_enable(NULL); - if (err != 0) { - LOG_ERR("Failed to enable USB, err %d", err); - return 0; - } - } - if (IS_ENABLED(CONFIG_UART_LINE_CTRL)) { LOG_INF("Wait for DTR"); From d5dbd3c15a1c4d4e126fcb89822f18bbc33e8a29 Mon Sep 17 00:00:00 2001 From: Juha Ylinen Date: Wed, 10 Sep 2025 14:41:11 +0300 Subject: [PATCH 10/46] tests: net: lwm2m: Align with API changes The clear_attrs() function signature changed. Signed-off-by: Juha Ylinen --- tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c | 2 +- tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c index 0ff828c432a4..f73c221a9f21 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c +++ b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c @@ -84,7 +84,7 @@ DEFINE_FAKE_VALUE_FUNC(int, dfu_target_modem_delta_reset); DEFINE_FAKE_VALUE_FUNC(bool, dfu_target_modem_delta_identify, const void *const); DEFINE_FAKE_VALUE_FUNC(int, modem_info_string_get, enum modem_info, char *, const size_t); DEFINE_FAKE_VALUE_FUNC(int, boot_read_bank_header, uint8_t, struct mcuboot_img_header *, size_t); -DEFINE_FAKE_VOID_FUNC(clear_attrs, void *); +DEFINE_FAKE_VOID_FUNC(clear_attrs, uint8_t, void *); DEFINE_FAKE_VALUE_FUNC(int, lwm2m_notify_observer_path, const struct lwm2m_obj_path *); DEFINE_FAKE_VOID_FUNC(engine_remove_observer_by_id, uint16_t, int32_t); DEFINE_FAKE_VALUE_FUNC(int, lwm2m_firmware_start_transfer, uint16_t, char *); diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h index b318cf26a027..2f70c73ce81b 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h +++ b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h @@ -81,7 +81,7 @@ DECLARE_FAKE_VALUE_FUNC(int, dfu_target_modem_delta_reset); DECLARE_FAKE_VALUE_FUNC(bool, dfu_target_modem_delta_identify, const void *const); DECLARE_FAKE_VALUE_FUNC(int, modem_info_string_get, enum modem_info, char *, const size_t); DECLARE_FAKE_VALUE_FUNC(int, boot_read_bank_header, uint8_t, struct mcuboot_img_header *, size_t); -DECLARE_FAKE_VOID_FUNC(clear_attrs, void *); +DECLARE_FAKE_VOID_FUNC(clear_attrs, uint8_t, void *); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_notify_observer_path, const struct lwm2m_obj_path *); DECLARE_FAKE_VOID_FUNC(engine_remove_observer_by_id, uint16_t, int32_t); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_firmware_start_transfer, uint16_t, char *); From ede58353fa14f9e1d3dc667317a9ef55d5827864 Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Fri, 12 Sep 2025 08:32:38 +0200 Subject: [PATCH 11/46] bluetooth: In hci_internal_msg_get add msg_type_out cast to avoid warn In the hci_internal_msg_get() there is a call to sdc_hci_get() that second parameter is uint8_t pointer. The provided msg_type_out argument is an enum sdc_hci_msg_type_t pointer that must fit into the uint8_t. Durign build compiler generates an error about incompatible pointer types. The commit adds a cast to uint8_t to fix the compilation error. Note: the enum sdc_hci_msg_type_t is defined in SoftDevice Controller headers. It is SoftDevice responsibility to make sure the enum doesn't contain values that don't fit into uint8_t. Signed-off-by: Piotr Pryga --- subsys/bluetooth/controller/hci_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsys/bluetooth/controller/hci_internal.c b/subsys/bluetooth/controller/hci_internal.c index 7e23b38412de..864284b962d3 100644 --- a/subsys/bluetooth/controller/hci_internal.c +++ b/subsys/bluetooth/controller/hci_internal.c @@ -1789,7 +1789,7 @@ int hci_internal_msg_get(uint8_t *msg_out, sdc_hci_msg_type_t *msg_type_out) return 0; } - const int retval = sdc_hci_get(msg_out, msg_type_out); + const int retval = sdc_hci_get(msg_out, (uint8_t*)msg_type_out); #if defined(CONFIG_BT_CTLR_SDC_PAWR_SYNC) if (retval == 0 && *msg_type_out == SDC_HCI_MSG_TYPE_EVT From 907f23e79dc5d318e06a7ff80d636993ae516ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20S=2E=20R=C3=B8stad?= Date: Fri, 12 Sep 2025 08:54:35 +0200 Subject: [PATCH 12/46] modules: memfault-firmware-sdk: Fix SMF handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SMF run functions now returns SMF_EVENT_HANDLED or SMF_EVENT_PROPAGATE. Fix this for all occurances in memfault_lte_coredump.c Signed-off-by: Simen S. Røstad --- .../memfault_lte_coredump.c | 45 ++++++++++++++----- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/modules/memfault-firmware-sdk/memfault_lte_coredump.c b/modules/memfault-firmware-sdk/memfault_lte_coredump.c index afab39903f47..128099626942 100644 --- a/modules/memfault-firmware-sdk/memfault_lte_coredump.c +++ b/modules/memfault-firmware-sdk/memfault_lte_coredump.c @@ -83,17 +83,17 @@ static void schedule_send_backoff(struct fsm_state_object *state_object); /* Forward declarations: State Machine Functions */ static void state_running_entry(void *o); -static void state_running_run(void *o); +static enum smf_state_result state_running_run(void *o); static void state_running_exit(void *o); static void state_waiting_for_nrf_modem_lib_init_entry(void *o); -static void state_waiting_for_nrf_modem_lib_init_run(void *o); -static void state_waiting_for_network_connection_run(void *o); +static enum smf_state_result state_waiting_for_nrf_modem_lib_init_run(void *o); +static enum smf_state_result state_waiting_for_network_connection_run(void *o); static void state_network_connected_entry(void *o); -static void state_network_connected_run(void *o); +static enum smf_state_result state_network_connected_run(void *o); static void state_coredump_send_attempt_entry(void *o); -static void state_coredump_send_attempt_run(void *o); +static enum smf_state_result state_coredump_send_attempt_run(void *o); static void state_coredump_send_backoff_entry(void *o); -static void state_coredump_send_backoff_run(void *o); +static enum smf_state_result state_coredump_send_backoff_run(void *o); static void state_finished_entry(void *o); static void state_error_entry(void *o); @@ -232,7 +232,7 @@ static void state_waiting_for_nrf_modem_lib_init_entry(void *o) state_object->retry_count = 0; } -static void state_waiting_for_nrf_modem_lib_init_run(void *o) +static enum smf_state_result state_waiting_for_nrf_modem_lib_init_run(void *o) { struct fsm_state_object *state_object = o; @@ -240,7 +240,10 @@ static void state_waiting_for_nrf_modem_lib_init_run(void *o) if (state_object->event == EVENT_NRF_MODEM_LIB_INITED) { smf_set_state(SMF_CTX(state_object), &states[STATE_RUNNING]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_running_entry(void *o) @@ -269,7 +272,7 @@ static void state_running_entry(void *o) } } -static void state_running_run(void *o) +static enum smf_state_result state_running_run(void *o) { struct fsm_state_object *state_object = o; @@ -277,9 +280,13 @@ static void state_running_run(void *o) if (state_object->event == EVENT_NRF_MODEM_LIB_SHUTDOWN) { smf_set_state(SMF_CTX(state_object), &states[STATE_WAITING_FOR_NRF_MODEM_LIB_INIT]); + return SMF_EVENT_HANDLED; } else if (state_object->event == EVENT_ERROR) { smf_set_state(SMF_CTX(state_object), &states[STATE_ERROR]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_running_exit(void *o) @@ -307,7 +314,7 @@ static void state_running_exit(void *o) (void)k_work_cancel_delayable(&state_object->backoff_work); } -static void state_waiting_for_network_connection_run(void *o) +static enum smf_state_result state_waiting_for_network_connection_run(void *o) { struct fsm_state_object *state_object = o; @@ -333,7 +340,10 @@ static void state_waiting_for_network_connection_run(void *o) if (state_object->lte_registered && state_object->pdn_active) { smf_set_state(SMF_CTX(state_object), &states[STATE_NETWORK_CONNECTED]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_network_connected_entry(void *o) @@ -345,7 +355,7 @@ static void state_network_connected_entry(void *o) state_object->retry_count = 0; } -static void state_network_connected_run(void *o) +static enum smf_state_result state_network_connected_run(void *o) { struct fsm_state_object *state_object = o; @@ -355,11 +365,15 @@ static void state_network_connected_run(void *o) state_object->lte_registered = false; smf_set_state(SMF_CTX(state_object), &states[STATE_WAITING_FOR_NETWORK_CONNECTION]); + return SMF_EVENT_HANDLED; } else if (state_object->event == EVENT_PDN_DEACTIVATED) { state_object->pdn_active = false; smf_set_state(SMF_CTX(state_object), &states[STATE_WAITING_FOR_NETWORK_CONNECTION]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_coredump_send_attempt_entry(void *o) @@ -399,7 +413,7 @@ static void state_coredump_send_attempt_entry(void *o) } } -static void state_coredump_send_attempt_run(void *o) +static enum smf_state_result state_coredump_send_attempt_run(void *o) { struct fsm_state_object *state_object = o; @@ -407,9 +421,13 @@ static void state_coredump_send_attempt_run(void *o) if (state_object->event == EVENT_COREDUMP_SEND_FAIL) { smf_set_state(SMF_CTX(state_object), &states[STATE_COREDUMP_SEND_BACKOFF]); + return SMF_EVENT_HANDLED; } else if (state_object->event == EVENT_COREDUMP_SEND_SUCCESS) { smf_set_state(SMF_CTX(state_object), &states[STATE_FINISHED]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_coredump_send_backoff_entry(void *o) @@ -421,7 +439,7 @@ static void state_coredump_send_backoff_entry(void *o) schedule_send_backoff(state_object); } -static void state_coredump_send_backoff_run(void *o) +static enum smf_state_result state_coredump_send_backoff_run(void *o) { struct fsm_state_object *state_object = o; @@ -429,7 +447,10 @@ static void state_coredump_send_backoff_run(void *o) if (state_object->event == EVENT_BACKOFF_TIMER_EXPIRED) { smf_set_state(SMF_CTX(state_object), &states[STATE_COREDUMP_SEND_ATTEMPT]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_finished_entry(void *o) From e738a57a49c1bc2fa27f02f0b53e9409063911dc Mon Sep 17 00:00:00 2001 From: Tommi Kangas Date: Fri, 12 Sep 2025 10:29:57 +0300 Subject: [PATCH 13/46] boards: nordic: thingy91x: Remove use of deprecated Kconfig option Removed use of deprecated NFCT_PINS_AS_GPIOS Kconfig option and added the NFCT pin configuration into devicetree instead. Signed-off-by: Tommi Kangas --- boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 | 3 --- boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 index d03191722bd4..db0280497a86 100644 --- a/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 +++ b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 @@ -48,9 +48,6 @@ endif # BUILD_WITH_TFM DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -config NFCT_PINS_AS_GPIOS - default y - if BOARD_THINGY91X_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi index b2ac367de398..2e9a90b5594a 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi @@ -129,6 +129,10 @@ pinctrl-names = "default", "sleep"; }; +&uicr { + nfct-pins-as-gpios; +}; + /* Include default memory partition configuration file. */ /* This is not the layout that's actually used! It's overridden by Partition Manager. */ #include From 53e0817efc4236dc4a818448e245a1961dcec581 Mon Sep 17 00:00:00 2001 From: Tommi Kangas Date: Fri, 12 Sep 2025 10:47:59 +0300 Subject: [PATCH 14/46] applications: serial_lte_modem: Remove undefined Kconfig options Removed a few Kconfig options which were in comments, because those no longer exist and caused an error. Signed-off-by: Tommi Kangas --- applications/serial_lte_modem/sysbuild/mcuboot/prj.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf index 0811a1162e4a..0820098ad277 100644 --- a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf +++ b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y From cc340673f8cdd76b1a5313be0748eac3a5992dd2 Mon Sep 17 00:00:00 2001 From: Tommi Kangas Date: Fri, 12 Sep 2025 12:06:38 +0300 Subject: [PATCH 15/46] treewide: Remove TinyCrypt Kconfig options from conf files Removed commented out TinyCrypt related Kconfig options from conf files. The Kconfig options no longer exist and even if the options are in comments, those still cause an error. Signed-off-by: Tommi Kangas --- applications/connectivity_bridge/sysbuild/mcuboot/prj.conf | 6 ------ applications/machine_learning/sysbuild/mcuboot/prj.conf | 6 ------ applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf | 6 ------ .../bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf | 6 ------ samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf | 6 ------ .../nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf | 6 ------ .../cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf | 6 ------ samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf | 6 ------ samples/net/aws_iot/sysbuild/mcuboot/prj.conf | 6 ------ samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf | 6 ------ samples/net/https_client/sysbuild/mcuboot/prj.conf | 6 ------ samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf | 6 ------ .../sysbuild/mcuboot/prj_no_network_core.conf | 6 ------ .../sysbuild/mcuboot/prj_no_network_core_directxip.conf | 6 ------ samples/wifi/shell/sysbuild/mcuboot/prj.conf | 6 ------ .../decompression/mcuboot_update/sysbuild/mcuboot/prj.conf | 6 ------ 16 files changed, 96 deletions(-) diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf index 5a57331d5789..500ba4225452 100644 --- a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf +++ b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf index d762bb27bdc0..49069c128766 100644 --- a/applications/machine_learning/sysbuild/mcuboot/prj.conf +++ b/applications/machine_learning/sysbuild/mcuboot/prj.conf @@ -18,12 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf index 378fc5af17a5..fa7c7c8d30c7 100644 --- a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf +++ b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf @@ -16,12 +16,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf index 5eb10bc12062..0ef784231d13 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf b/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf index d47a160e233d..63e9968f7d2c 100644 --- a/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf index 5eb10bc12062..0ef784231d13 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf index 46e6cc3c0141..b14f23471808 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf index 61432be3b7a0..8e13e683be8f 100644 --- a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf @@ -10,12 +10,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf index 4943e831d2d6..ca7adf35ff53 100644 --- a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf +++ b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf @@ -18,12 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf index 5eb10bc12062..0ef784231d13 100644 --- a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/net/https_client/sysbuild/mcuboot/prj.conf b/samples/net/https_client/sysbuild/mcuboot/prj.conf index d47a160e233d..63e9968f7d2c 100644 --- a/samples/net/https_client/sysbuild/mcuboot/prj.conf +++ b/samples/net/https_client/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf index 2e8613b74cfe..d32556bb2253 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf index 70d5772115be..43b45134abe3 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf index 70d5772115be..43b45134abe3 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/samples/wifi/shell/sysbuild/mcuboot/prj.conf b/samples/wifi/shell/sysbuild/mcuboot/prj.conf index e81dce54d761..7b6aba30942a 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/prj.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/prj.conf @@ -18,12 +18,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf index 882343826068..c461ed29f056 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf @@ -12,12 +12,6 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y From b6b618908ce506ac5ccecd199e3a291821e37653 Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Fri, 12 Sep 2025 10:56:32 +0200 Subject: [PATCH 16/46] bluetooth: cs_de: Fix after combined main and sub mode CS steps There was a change in sdk-zephyr Bluetooth host implementation that combined main and sub CS mode steps. Not all combinations of main mode and sub mode are valid, so to make it harder to select incorrect parameters, the main mode and sub mode enums are combined into one. With that change names of some CS related enums were changed. The commit aligns sdk-nrf to use the new names. Signed-off-by: Piotr Pryga --- samples/bluetooth/channel_sounding_ras_initiator/src/main.c | 3 +-- subsys/bluetooth/cs_de/cs_de.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/samples/bluetooth/channel_sounding_ras_initiator/src/main.c b/samples/bluetooth/channel_sounding_ras_initiator/src/main.c index 7f5a5d0265b7..3b27d1715259 100644 --- a/samples/bluetooth/channel_sounding_ras_initiator/src/main.c +++ b/samples/bluetooth/channel_sounding_ras_initiator/src/main.c @@ -648,8 +648,7 @@ int main(void) struct bt_le_cs_create_config_params config_params = { .id = CS_CONFIG_ID, - .main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2, - .sub_mode_type = BT_CONN_LE_CS_SUB_MODE_1, + .mode = BT_CONN_LE_CS_MAIN_MODE_2_SUB_MODE_1, .min_main_mode_steps = 2, .max_main_mode_steps = 5, .main_mode_repetition = 0, diff --git a/subsys/bluetooth/cs_de/cs_de.c b/subsys/bluetooth/cs_de/cs_de.c index cd8f6a21cd25..468115c838e9 100644 --- a/subsys/bluetooth/cs_de/cs_de.c +++ b/subsys/bluetooth/cs_de/cs_de.c @@ -387,7 +387,7 @@ static bool process_step_data(struct bt_le_cs_subevent_step *local_step, { cs_de_report_t *p_report = (cs_de_report_t *)user_data; - if (local_step->mode == BT_CONN_LE_CS_MAIN_MODE_2) { + if (local_step->mode == BT_HCI_OP_LE_CS_MAIN_MODE_2) { struct bt_hci_le_cs_step_data_mode_2 *local_step_data = (struct bt_hci_le_cs_step_data_mode_2 *)local_step->data; struct bt_hci_le_cs_step_data_mode_2 *peer_step_data = From 760e23c8e50cfe7bf9e6e04d521d1941a0780b6b Mon Sep 17 00:00:00 2001 From: Tommi Kangas Date: Fri, 12 Sep 2025 12:49:28 +0300 Subject: [PATCH 17/46] samples: wifi: shell: Remove CONFIG_NFCT_PINS_AS_GPIOS from overlay The CONFIG_NFCT_PINS_AS_GPIOS Kconfig option no longer exists and the configuration is done through devicetree. The feature is enabled by default by the board, so there's no need to enable it. Signed-off-by: Tommi Kangas --- samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf b/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf index c02f67e58778..68d18eb53a80 100644 --- a/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf @@ -11,8 +11,6 @@ CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_I2C=y -CONFIG_NFCT_PINS_AS_GPIOS=y - # USB CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Thingy:91 X Wi-Fi Shell" From 83f80ef9ec93b351a751132a9034053424db339a Mon Sep 17 00:00:00 2001 From: Ravi Dondaputi Date: Fri, 12 Sep 2025 16:18:55 +0530 Subject: [PATCH 18/46] samples: wifi: softap: Fix twister errors Correct the return type for `.run` functions of SMF. Enable SETTINGS which is required for wifi_credentials support. Signed-off-by: Ravi Dondaputi --- samples/wifi/provisioning/softap/prj.conf | 1 + .../softap_wifi_provision.c | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/samples/wifi/provisioning/softap/prj.conf b/samples/wifi/provisioning/softap/prj.conf index 4c43dfcea34a..328d8847f63d 100644 --- a/samples/wifi/provisioning/softap/prj.conf +++ b/samples/wifi/provisioning/softap/prj.conf @@ -23,6 +23,7 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT=y CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y CONFIG_NET_L2_ETHERNET=y CONFIG_WIFI_CREDENTIALS=y +CONFIG_SETTINGS=y # General CONFIG_LOG=y diff --git a/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c b/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c index a6b3b28d59e0..e925e5f1ec92 100644 --- a/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c +++ b/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c @@ -600,7 +600,7 @@ static void init_entry(void *o) parser_settings.on_url = on_url; } -static void init_run(void *o) +static enum smf_state_result init_run(void *o) { struct s_object *user_object = o; @@ -611,6 +611,8 @@ static void init_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } /* Scan and cache Wi-Fi results in unprovisioned state. */ @@ -630,7 +632,7 @@ static void unprovisioned_entry(void *o) } } -static void unprovisioned_run(void *o) +static enum smf_state_result unprovisioned_run(void *o) { struct s_object *user_object = o; @@ -641,6 +643,8 @@ static void unprovisioned_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } static void unprovisioned_exit(void *o) @@ -685,7 +689,7 @@ static void provisioning_entry(void *o) notify_app(SOFTAP_WIFI_PROVISION_EVT_STARTED); } -static void provisioning_run(void *o) +static enum smf_state_result provisioning_run(void *o) { struct s_object *user_object = o; @@ -699,6 +703,8 @@ static void provisioning_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } /* Wi-Fi credentials received, provisioning complete, cleanup and disable AP mode. */ @@ -732,7 +738,7 @@ static void provisioning_exit(void *o) } } -static void provisioned_run(void *o) +static enum smf_state_result provisioned_run(void *o) { struct s_object *user_object = o; @@ -743,6 +749,8 @@ static void provisioned_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } static void provisioned_exit(void *o) @@ -766,7 +774,7 @@ static void finished_entry(void *o) k_sem_give(&softap_wifi_provision_sem); } -static void finished_run(void *o) +static enum smf_state_result finished_run(void *o) { struct s_object *user_object = o; @@ -775,6 +783,8 @@ static void finished_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } /* Delete Wi-Fi credentials upon exit of the provisioning state. */ From 5d6b20e00f87cb5c79be22239c661f18a957cb6e Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Tue, 15 Jul 2025 10:11:38 +0200 Subject: [PATCH 19/46] drivers: mspi: remove redundant gpd handling Manual handling of global power domains using gpd has been made redundant by power domain and pinctrl refactoring, and gpd has thus been removed. Remove gpd handling from mspi driver, as this is automatically done by pinctrl_apply_state() now. Signed-off-by: Bjarki Arge Andreasen --- drivers/mspi/mspi_sqspi.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/drivers/mspi/mspi_sqspi.c b/drivers/mspi/mspi_sqspi.c index 84998fcc8ab1..f349d03e771a 100644 --- a/drivers/mspi/mspi_sqspi.c +++ b/drivers/mspi/mspi_sqspi.c @@ -21,9 +21,6 @@ #include #include #endif -#if defined(CONFIG_SOC_NRF54H20_GPD) -#include -#endif #include LOG_MODULE_REGISTER(mspi_sqspi, CONFIG_MSPI_LOG_LEVEL); @@ -432,13 +429,6 @@ static int dev_pm_action_cb(const struct device *dev, return rc; } -#if defined(CONFIG_SOC_NRF54H20_GPD) - rc = nrf_gpd_retain_pins_set(dev_config->pcfg, false); - if (rc < 0) { - LOG_ERR("Cannot clear RETAIN for pins (%d)", rc); - return rc; - } -#endif nrf_sqspi_activate(&dev_config->sqspi); #if defined(CONFIG_SOC_SERIES_NRF54LX) nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, @@ -452,13 +442,6 @@ static int dev_pm_action_cb(const struct device *dev, if (IS_ENABLED(CONFIG_PM_DEVICE) && action == PM_DEVICE_ACTION_SUSPEND) { -#if defined(CONFIG_SOC_NRF54H20_GPD) - rc = nrf_gpd_retain_pins_set(dev_config->pcfg, true); - if (rc < 0) { - LOG_ERR("Cannot set RETAIN for pins (%d)", rc); - return rc; - } -#endif rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP); if (rc < 0) { From 0dd0d7ca2676d4e3915c3365ec5c6fab7dbc0615 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Thu, 31 Jul 2025 14:29:09 +0200 Subject: [PATCH 20/46] samples: smp_svr: extend mcuboot_merged_slot.overlay The board overlay in bootloader/mcuboot for the nrf54h20dk/nrf54h20/cpuapp platform is required, but ignored as FILE_SUFFIX="merged_slot" matches the mcuboot_merged_slot.overlay in this sample instead. Copy the missing contents of the board overlay from bootloader/mcuboot to mcuboot_merged_slot.overlay Signed-off-by: Bjarki Arge Andreasen --- .../sysbuild/mcuboot_merged_slot.overlay | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay index 80537ee8643b..267c6263d9cb 100644 --- a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay +++ b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay @@ -11,3 +11,58 @@ zephyr,code-partition = &boot_partition; }; }; + +/* + * Copy required overlay for mcuboot from bootloader/mcuboot. + * + * Required as the overlay in bootloader/mcuboot is ignored due to + * FILE_SUFFIX="merged_slot" matching this overlay instead. + */ + +&gdpwr { + status = "disabled"; +}; + +&gdpwr_fast_active_0 { + status = "disabled"; +}; + +&gdpwr_fast_active_1 { + status = "disabled"; +}; + +&gdpwr_fast_main { + status = "disabled"; +}; + +&gdpwr_slow_active { + status = "disabled"; +}; + +&gdpwr_slow_main { + status = "disabled"; +}; + +&gpio_pad_group0 { + status = "disabled"; +}; + +&gpio_pad_group1 { + status = "disabled"; +}; + +&gpio_pad_group2 { + status = "disabled"; +}; + +&gpio_pad_group6 { + status = "disabled"; +}; + +&gpio_pad_group7 { + status = "disabled"; +}; + +&gpio_pad_group9 { + status = "disabled"; +}; From 77b4cd2d6da4adaaca2c4d5d5b666a4a183b319a Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Thu, 31 Jul 2025 14:47:10 +0200 Subject: [PATCH 21/46] nrf_compress: decompression: mcuboot_update: adjust nrf54h20dk pd Adjust nrf54h20dk/nrf54h20/cpuapp overlay and conf to include required props from the overlay in bootloader/mcuboot. Specifically disabling power domains. Signed-off-by: Bjarki Arge Andreasen --- .../boards/nrf54h20dk_nrf54h20_cpuapp.conf | 4 ++ .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 55 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf index dd8a2f1f68e2..55c9b5607f1c 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -8,3 +8,7 @@ CONFIG_SPI_NOR=n CONFIG_FPROTECT=n CONFIG_BOOT_WATCHDOG_FEED=n + +# Power domains forced on by default on boot, no need +# to manage them in bootloader. +CONFIG_POWER_DOMAIN=n diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 31d9b441aa51..6c30ddb34989 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -11,3 +11,58 @@ zephyr,code-partition = &boot_partition; }; }; + +/* + * Copy required overlay for mcuboot from bootloader/mcuboot. + * + * Required as the overlay in bootloader/mcuboot is ignored due to + * board overlay in this test. + */ + +&gdpwr { + status = "disabled"; +}; + +&gdpwr_fast_active_0 { + status = "disabled"; +}; + +&gdpwr_fast_active_1 { + status = "disabled"; +}; + +&gdpwr_fast_main { + status = "disabled"; +}; + +&gdpwr_slow_active { + status = "disabled"; +}; + +&gdpwr_slow_main { + status = "disabled"; +}; + +&gpio_pad_group0 { + status = "disabled"; +}; + +&gpio_pad_group1 { + status = "disabled"; +}; + +&gpio_pad_group2 { + status = "disabled"; +}; + +&gpio_pad_group6 { + status = "disabled"; +}; + +&gpio_pad_group7 { + status = "disabled"; +}; + +&gpio_pad_group9 { + status = "disabled"; +}; From dc3667e1e4b76bf427603889192d2ea3866b4e44 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Thu, 7 Aug 2025 13:50:26 +0200 Subject: [PATCH 22/46] benchmarks: multicore: idle: select PM_DEVICE_RUNTIME The global power domains require PM_DEVICE to be power managed. Enable PM_DEVICE, and unselect the default, optional, not required PM_DEVICE_RUNTIME_ASYNC feature. Signed-off-by: Bjarki Arge Andreasen --- tests/benchmarks/multicore/idle/testcase.yaml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml index 5e48bde7b1a3..6bd404c5c917 100644 --- a/tests/benchmarks/multicore/idle/testcase.yaml +++ b/tests/benchmarks/multicore/idle/testcase.yaml @@ -103,6 +103,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -110,6 +112,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -135,6 +139,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -143,6 +149,8 @@ tests: - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n - CONFIG_FPU=y + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -168,6 +176,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -175,6 +185,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -201,6 +213,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -208,6 +222,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -234,6 +250,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -241,6 +259,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -266,6 +286,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -273,6 +295,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -299,6 +323,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -306,6 +332,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n From de6dfc8e7bd632ed1dc2aa5a787fab1f9a1a3dfa Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Fri, 12 Sep 2025 13:55:11 +0200 Subject: [PATCH 23/46] applications: matter: Fix Weather Station USB stack Switched to the new USB stack. Signed-off-by: Arkadiusz Balys --- applications/matter_weather_station/prj.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/applications/matter_weather_station/prj.conf b/applications/matter_weather_station/prj.conf index 9a1e8eba45be..20230ea30763 100644 --- a/applications/matter_weather_station/prj.conf +++ b/applications/matter_weather_station/prj.conf @@ -73,10 +73,11 @@ CONFIG_SHELL=y CONFIG_SHELL_LOG_BACKEND=y # Configure USB CDC ACM -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n -CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x530D +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thingy:53 Matter Weather" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x530D CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 From fb5b2bd728c54ad84a398d57c85ece348355a8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katarzyna=20Gi=C4=85d=C5=82a?= Date: Fri, 12 Sep 2025 14:39:50 +0200 Subject: [PATCH 24/46] quarantine: Add overflows to quarantine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test configurations will added to quarantine due to RAM overflow. Signed-off-by: Katarzyna Giądła --- scripts/quarantine.yaml | 6 ++++++ scripts/quarantine_zephyr.yaml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index a8ef6a55f3e4..669880ece1e5 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -100,6 +100,12 @@ - nrf54h20dk@0.9.0/nrf54h20/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35382" +- scenarios: + - sample.bluetooth.mesh.sensor_client + platforms: + - nrf52dk/nrf52832 + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35409" + - scenarios: - sample.bluetooth.peripheral_mds platforms: diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index de8bef1fa29c..93dc249cc125 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -297,6 +297,7 @@ - kernel.threads.dynamic_thread.stack.no_pool.alloc.no_user - kernel.threads.dynamic_thread.stack.pool.no_alloc.no_user - kernel.threads.dynamic_thread.stack.no_pool.no_alloc.user + - kernel.poll.minimallibc - kernel.scheduler.no_timeslicing - kernel.scheduler.dumb_no_timeslicing - kernel.scheduler.dumb_timeslicing @@ -365,6 +366,7 @@ - sample.net.sockets.socketpair - sample.drivers.crypto.mbedtls - kernel.workqueue.api + - kernel.workqueue.work_timeout - sample.posix.env - sample.shell.shell_module - kernel.common @@ -390,6 +392,7 @@ - crypto.tinycrypt.hmac_prng - drivers.can.shell - kernel.common + - kernel.common.lto - kernel.common.minimallibc - kernel.common.misra - kernel.common.nano32 From 196b8edcac10df58eeb174ae3958250798b059c0 Mon Sep 17 00:00:00 2001 From: Tommi Kangas Date: Mon, 15 Sep 2025 08:42:33 +0300 Subject: [PATCH 25/46] applications: serial_lte_modem: Fix compilation warning Fixed a compilation warning from configure_power_pin_interrupt(). Signed-off-by: Tommi Kangas --- applications/serial_lte_modem/src/slm_ctrl_pin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/serial_lte_modem/src/slm_ctrl_pin.c b/applications/serial_lte_modem/src/slm_ctrl_pin.c index 6195199d6c1a..d762bee13ecc 100644 --- a/applications/serial_lte_modem/src/slm_ctrl_pin.c +++ b/applications/serial_lte_modem/src/slm_ctrl_pin.c @@ -99,7 +99,7 @@ static int configure_power_pin_interrupt(gpio_callback_handler_t handler, gpio_f */ err = gpio_pin_interrupt_configure(gpio_dev, pin, GPIO_INT_DISABLE); if (err) { - LOG_ERR("Failed to configure %s (0x%x) on power pin. (%d)", + LOG_ERR("Failed to configure %s (0x%lx) on power pin. (%d)", "interrupt", GPIO_INT_DISABLE, err); } From c58ecb16b9348b75ca80499d30bf0203b8bdc37f Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Fri, 12 Sep 2025 15:57:27 +0200 Subject: [PATCH 26/46] samples: bluetooth: remote_shell: use CDC ACM serial backend Use CDC ACM serial backend from the new USB device support. Signed-off-by: Johann Fischer --- .../sysbuild/remote_shell/prj_usb_5340.conf | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb_5340.conf b/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb_5340.conf index e4df2db7d0a1..dad566644391 100644 --- a/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb_5340.conf +++ b/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb_5340.conf @@ -17,10 +17,13 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG=y CONFIG_HEAP_MEM_POOL_SIZE=4096 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic Remote Shell sample" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x53AA +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_LOG_LEVEL_ERR=y # Config logger CONFIG_LOG=y @@ -28,7 +31,5 @@ CONFIG_LOG_PRINTK=y CONFIG_USE_SEGGER_RTT=y CONFIG_LOG_BACKEND_RTT=y CONFIG_LOG_BACKEND_UART=n -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_SOC_NRF53_CPUNET_ENABLE=y From 934ccc2461591a6cadd44d89b2f446e5c5237b2b Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Fri, 12 Sep 2025 23:23:33 +0200 Subject: [PATCH 27/46] samples: peripheral: use CDC ACM serial backend Use CDC ACM serial backend from the new USB device support. Signed-off-by: Johann Fischer --- samples/peripheral/802154_sniffer/prj.conf | 14 ++++++++------ .../radio_test/sysbuild/remote_shell/prj_usb.conf | 15 +++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/samples/peripheral/802154_sniffer/prj.conf b/samples/peripheral/802154_sniffer/prj.conf index 2baa60af5b66..008ebead08bf 100644 --- a/samples/peripheral/802154_sniffer/prj.conf +++ b/samples/peripheral/802154_sniffer/prj.conf @@ -21,15 +21,17 @@ CONFIG_SHELL_VT100_COLORS=n CONFIG_DK_LIBRARY=y # USB configuration -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="nRF 802154 Sniffer" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x154b CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PID=0x0004 +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="nRF 802154 Sniffer" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x154b # Disable boot banner CONFIG_BOOT_BANNER=n diff --git a/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf b/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf index e4df2db7d0a1..f7ac8327acd4 100644 --- a/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf +++ b/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf @@ -17,10 +17,13 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG=y CONFIG_HEAP_MEM_POOL_SIZE=4096 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic Remote Shell sample" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x53AA + # Config logger CONFIG_LOG=y @@ -28,7 +31,7 @@ CONFIG_LOG_PRINTK=y CONFIG_USE_SEGGER_RTT=y CONFIG_LOG_BACKEND_RTT=y CONFIG_LOG_BACKEND_UART=n -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_LOG_LEVEL_ERR=y CONFIG_SOC_NRF53_CPUNET_ENABLE=y From 9914d25c5c0b7e886048d02eca19ef9cf799e8ee Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Fri, 12 Sep 2025 23:42:14 +0200 Subject: [PATCH 28/46] samples: wifi: allow samples using legacy USB stacks to pass CI Add CONFIG_DEPRECATION_TEST=y to sample configuration. Signed-off-by: Johann Fischer --- samples/wifi/monitor/overlay-netusb.conf | 3 +++ samples/wifi/promiscuous/overlay-netusb.conf | 3 +++ samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf | 3 +++ samples/wifi/shell/overlay-netusb.conf | 3 +++ .../sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf | 3 +++ samples/wifi/wfa_qt_app/overlay-netusb.conf | 3 +++ 6 files changed, 18 insertions(+) diff --git a/samples/wifi/monitor/overlay-netusb.conf b/samples/wifi/monitor/overlay-netusb.conf index e7a3a45a09e4..ee8233f61b9f 100644 --- a/samples/wifi/monitor/overlay-netusb.conf +++ b/samples/wifi/monitor/overlay-netusb.conf @@ -14,3 +14,6 @@ CONFIG_NET_SOCKETS_POLL_MAX=10 # DUT responses are > 1500, so, need to fragment CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/promiscuous/overlay-netusb.conf b/samples/wifi/promiscuous/overlay-netusb.conf index e7a3a45a09e4..ee8233f61b9f 100644 --- a/samples/wifi/promiscuous/overlay-netusb.conf +++ b/samples/wifi/promiscuous/overlay-netusb.conf @@ -14,3 +14,6 @@ CONFIG_NET_SOCKETS_POLL_MAX=10 # DUT responses are > 1500, so, need to fragment CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf b/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf index 68d18eb53a80..67f04add5b53 100644 --- a/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf @@ -30,3 +30,6 @@ CONFIG_RTT_CONSOLE=n CONFIG_FW_INFO=y CONFIG_SECURE_BOOT_STORAGE=y + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/shell/overlay-netusb.conf b/samples/wifi/shell/overlay-netusb.conf index abdc8dc6e222..5136b086e81b 100644 --- a/samples/wifi/shell/overlay-netusb.conf +++ b/samples/wifi/shell/overlay-netusb.conf @@ -17,3 +17,6 @@ CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 # For netusb WFA_THREADS_NUM CONFIG_POSIX_THREAD_THREADS_MAX=5 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf index 9b840fc2b9ac..b6ab59846315 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf @@ -83,3 +83,6 @@ CONFIG_MFD_NPM13XX=n CONFIG_BOOT_SERIAL_NO_APPLICATION=y CONFIG_PM_DEVICE_RUNTIME=y + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/wfa_qt_app/overlay-netusb.conf b/samples/wifi/wfa_qt_app/overlay-netusb.conf index 45049168260c..6a93f45c60c6 100644 --- a/samples/wifi/wfa_qt_app/overlay-netusb.conf +++ b/samples/wifi/wfa_qt_app/overlay-netusb.conf @@ -12,3 +12,6 @@ CONFIG_NET_IF_MAX_IPV4_COUNT=2 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2 CONFIG_NET_CONFIG_USB_IPV4_ADDR="192.0.2.1" CONFIG_USB_NRFX_WORK_QUEUE_STACK_SIZE=2048 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y From e2b41f97f5c711bd8259496baf47f01a64bcc79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Laso=C5=84czyk?= Date: Thu, 11 Sep 2025 15:07:38 +0200 Subject: [PATCH 29/46] samples: i2c: Add missing Kconfig to rtio_loopback sample MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Kconfig with sourcing main Kconfig file. Signed-off-by: Karol Lasończyk --- samples/zephyr/drivers/i2c/rtio_loopback/Kconfig | 1 + 1 file changed, 1 insertion(+) create mode 100644 samples/zephyr/drivers/i2c/rtio_loopback/Kconfig diff --git a/samples/zephyr/drivers/i2c/rtio_loopback/Kconfig b/samples/zephyr/drivers/i2c/rtio_loopback/Kconfig new file mode 100644 index 000000000000..820e72f8d52b --- /dev/null +++ b/samples/zephyr/drivers/i2c/rtio_loopback/Kconfig @@ -0,0 +1 @@ +source "samples/drivers/i2c/rtio_loopback/Kconfig" From cfd81844335bd7207e9ee53949eef447277573de Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Mon, 15 Sep 2025 14:34:49 +0200 Subject: [PATCH 30/46] tests: bluetooth: iso Remove uses of auto name from advertising params The BT_LE_ADV_OPT_USE_NAME option was deprecated. There is no automatic add of a name to advertising params. It must be done manually by call to bt_le_ext_adv_set_data() in case of extended advertising. The commit changes the ISO test code that was still using the deprecated option. Signed-off-by: Piotr Pryga --- tests/bluetooth/iso/modules/peripheral.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/bluetooth/iso/modules/peripheral.c b/tests/bluetooth/iso/modules/peripheral.c index 7f3410d84c1e..d10cffd3f04e 100644 --- a/tests/bluetooth/iso/modules/peripheral.c +++ b/tests/bluetooth/iso/modules/peripheral.c @@ -13,9 +13,14 @@ LOG_MODULE_REGISTER(peripheral, CONFIG_ACL_TEST_LOG_LEVEL); #define LE_AUDIO_EXTENDED_ADV_CONN_NAME \ - BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_CONN | BT_LE_ADV_OPT_USE_NAME, \ + BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV | BT_LE_ADV_OPT_CONN, \ 0x100, 0x200, NULL) +/* Set the advertising data. */ +struct bt_data adv_data[] = { + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1) +}; + static struct k_work adv_work; static struct bt_conn *default_conn; static struct bt_le_ext_adv *adv_ext; @@ -143,6 +148,13 @@ static int peripheral_init(void) return ret; } + /* Set the advertising data */ + err = bt_le_ext_adv_set_data(adv_ext, adv_data, ARRAY_SIZE(adv_data), NULL, 0); + if (err) { + LOG_ERR("Failed to set advertising data. Err: %d", err); + return; + } + initialized = true; LOG_INF("Peripheral initialized"); From de2bfc11f0704d457b3a845eec981c612a170146 Mon Sep 17 00:00:00 2001 From: Sergei Ovchinnikov Date: Mon, 15 Sep 2025 15:07:45 +0200 Subject: [PATCH 31/46] samples: pmic: fix devicetree errors on uicr build By applying shields only to the main image Signed-off-by: Sergei Ovchinnikov --- samples/pmic/native/npm13xx_fuel_gauge/README.rst | 2 +- samples/pmic/native/npm13xx_fuel_gauge/sample.yaml | 4 ++-- samples/pmic/native/npm13xx_one_button/README.rst | 2 +- samples/pmic/native/npm13xx_one_button/sample.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/pmic/native/npm13xx_fuel_gauge/README.rst b/samples/pmic/native/npm13xx_fuel_gauge/README.rst index 5407acf5441c..f2a69ab0c1a9 100644 --- a/samples/pmic/native/npm13xx_fuel_gauge/README.rst +++ b/samples/pmic/native/npm13xx_fuel_gauge/README.rst @@ -121,7 +121,7 @@ You can use either the nRF Connect for VS Code extension or the command line. .. code-block:: bash - -DSHIELD=npm1300_ek + -Dnpm13xx_fuel_gauge_SHIELD=npm1300_ek To apply an extra overlay, choose the respective file from the **Extra Devicetree overlays** drop-down menu diff --git a/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml b/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml index c162acf8b5a6..f65e59432412 100644 --- a/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml +++ b/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml @@ -30,11 +30,11 @@ tests: sysbuild: true build_only: true extra_args: - - SHIELD=npm1300_ek + - npm13xx_fuel_gauge_SHIELD=npm1300_ek - EXTRA_DTC_OVERLAY_FILE=npm1300.overlay sample.npm1304_fuel_gauge_compile: sysbuild: true build_only: true extra_args: - - SHIELD=npm1304_ek + - npm13xx_fuel_gauge_SHIELD=npm1304_ek - EXTRA_DTC_OVERLAY_FILE=npm1304.overlay diff --git a/samples/pmic/native/npm13xx_one_button/README.rst b/samples/pmic/native/npm13xx_one_button/README.rst index 109885875935..95819fb9d0cc 100644 --- a/samples/pmic/native/npm13xx_one_button/README.rst +++ b/samples/pmic/native/npm13xx_one_button/README.rst @@ -118,7 +118,7 @@ You can use either the nRF Connect for VS Code extension or the command line. .. code-block:: bash - -DSHIELD=npm1300_ek + -Dnpm13xx_one_button_SHIELD=npm1300_ek To apply an extra overlay, choose the respective file from the **Extra Devicetree overlays** drop-down menu diff --git a/samples/pmic/native/npm13xx_one_button/sample.yaml b/samples/pmic/native/npm13xx_one_button/sample.yaml index 31d8893df7ef..b23f85c3ef8d 100644 --- a/samples/pmic/native/npm13xx_one_button/sample.yaml +++ b/samples/pmic/native/npm13xx_one_button/sample.yaml @@ -30,11 +30,11 @@ tests: sysbuild: true build_only: true extra_args: - - SHIELD=npm1300_ek + - npm13xx_one_button_SHIELD=npm1300_ek - EXTRA_DTC_OVERLAY_FILE=npm1300.overlay sample.npm1304_one_button_compile: sysbuild: true build_only: true extra_args: - - SHIELD=npm1304_ek + - npm13xx_one_button_SHIELD=npm1304_ek - EXTRA_DTC_OVERLAY_FILE=npm1304.overlay From 27a6f1c45698fcf69c7a1d8654ea26ccdfffae22 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Mon, 15 Sep 2025 14:57:38 +0200 Subject: [PATCH 32/46] applications: nrf_desktop: Fix legacy USB CI failures The nRF Desktop still uses USB legacy stack in some configurations. Disable deprecation warnings to workaround build failures in CI. Jira: NCSDK-35440 Signed-off-by: Marek Pieta --- .../nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf | 2 ++ .../configuration/nrf52820dongle_nrf52820/prj_release.conf | 2 ++ .../nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf | 2 ++ .../configuration/nrf52833dk_nrf52820/prj_release.conf | 2 ++ .../nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf | 2 ++ .../configuration/nrf52833dk_nrf52833/prj_dongle_small.conf | 2 ++ .../configuration/nrf52833dk_nrf52833/prj_release.conf | 2 ++ .../nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf | 2 ++ .../configuration/nrf52833dongle_nrf52833/prj_release.conf | 2 ++ .../nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf | 2 ++ .../configuration/nrf52840dk_nrf52840/prj_dongle.conf | 2 ++ .../configuration/nrf52840dk_nrf52840/prj_fast_pair.conf | 2 ++ .../configuration/nrf52840dk_nrf52840/prj_keyboard.conf | 2 ++ .../configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf | 2 ++ .../configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf | 2 ++ .../configuration/nrf52840dk_nrf52840/prj_release.conf | 2 ++ .../nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf | 2 ++ .../nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf | 2 ++ .../configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf | 2 ++ .../configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf | 2 ++ .../configuration/nrf52840dongle_nrf52840/prj_release.conf | 2 ++ .../nrf52840dongle_nrf52840/prj_release_4llpmconn.conf | 2 ++ .../nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf | 2 ++ .../configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf | 2 ++ .../configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf | 2 ++ .../configuration/nrf52840gmouse_nrf52840/prj_release.conf | 2 ++ .../nrf52840gmouse_nrf52840/prj_release_fast_pair.conf | 2 ++ .../nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf | 2 ++ .../configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf | 2 ++ 29 files changed, 58 insertions(+) diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf index 83178bc5fb80..a88c80af742e 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf index 9666cae293b0..b6690c803b2c 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf index 44b835e9dd86..19f98af6ed06 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf index 887ba5276915..715df297c3ab 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf index 17361fb23b3b..914f7350b58e 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf index 4992e79e6737..50ab448d962b 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_dongle_small.conf @@ -25,6 +25,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf index cd8f188732e1..b098a6d326ec 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf index 283a59cefe05..055949a7f8de 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf index 5b53e2af9529..1c0391c3ec75 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52E1 CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf index b75d1cf51894..9f5646173785 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf @@ -34,6 +34,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf index cadc50aea5d2..52f707e7fb47 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf @@ -24,6 +24,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf index 5549bd9816c0..caa9ce34f619 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf @@ -43,6 +43,8 @@ CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y # Align advertising intervals with Fast Pair specification. CONFIG_CAF_BLE_ADV_FAST_INT_MIN=0x0040 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf index 49355389ea0a..6a8dc518aeed 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf @@ -41,6 +41,8 @@ CONFIG_DESKTOP_BUTTONS_SIM_LOOP_FOREVER=y CONFIG_DESKTOP_BUTTONS_SIM_TRIGGER_KEY_ID=0x03 CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_PEER_CONTROL=y CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0000 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf index 40c2047dd968..8835ba7f2fd4 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf @@ -38,6 +38,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf index 90c65926c8c2..56ee0ce196ad 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf @@ -42,6 +42,8 @@ CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf index 32fdf8ae7113..75c60a9910ee 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf @@ -29,6 +29,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_PEER_CONTROL=y CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0000 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf index 14901f70967b..8755a78d2686 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf @@ -40,6 +40,8 @@ CONFIG_CAF_BLE_ADV_SLOW_INT_MIN=0x0070 CONFIG_CAF_BLE_ADV_SLOW_INT_MAX=0x00a0 CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf index c8a9b6d961d4..ca69ce0e8aa1 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf index 12910a637cee..6e0c7de7c6e5 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf @@ -26,6 +26,8 @@ CONFIG_CAF_LEDS=y CONFIG_CAF_BLE_USE_LLPM=n CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_HID_DONGLE_CONN_COUNT=3 CONFIG_DESKTOP_HID_DONGLE_BOND_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf index a77fd9f7282c..a7472263fb58 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf @@ -25,6 +25,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_HID_DONGLE_CONN_COUNT=4 CONFIG_DESKTOP_HID_DONGLE_BOND_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf index 5c90497718a8..2393c7932c53 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_BLE_PEER_CONTROL=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf index 1bb1bd7684e0..60fd4a38501f 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_HID_DONGLE_CONN_COUNT=4 CONFIG_DESKTOP_HID_DONGLE_BOND_COUNT=6 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf index d91b20404ae1..f9cd8c0fe9c8 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf @@ -59,6 +59,8 @@ CONFIG_DESKTOP_BATTERY_MEAS_VOLTAGE_DIVIDER_LOWER=180 CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA=10 CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf index 2cba02f9b1f6..8c9d430f8091 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf @@ -69,6 +69,8 @@ CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y CONFIG_CAF_INIT_LOG_BLE_SMP_TRANSFER_EVENTS=n CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y # Align advertising intervals with Fast Pair specification. CONFIG_CAF_BLE_ADV_FAST_INT_MIN=0x0040 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf index 646fcd01556b..4dce56158089 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf @@ -67,6 +67,8 @@ CONFIG_DESKTOP_BATTERY_MEAS_VOLTAGE_DIVIDER_LOWER=180 CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA=10 CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_USE_DEFAULT_ID=y diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf index fe6c25e7cea9..916ffb23d984 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf @@ -53,6 +53,8 @@ CONFIG_DESKTOP_BATTERY_MEAS_VOLTAGE_DIVIDER_LOWER=180 CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA=10 CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_BLE_PEER_CONTROL=y CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0007 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf index 8dfbf943b476..896d9479be36 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release_fast_pair.conf @@ -62,6 +62,8 @@ CONFIG_DESKTOP_VOLTAGE_TO_SOC_DELTA=10 CONFIG_DESKTOP_DFU_MCUMGR_ENABLE=y CONFIG_DESKTOP_USB_ENABLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y # Align advertising intervals with Fast Pair specification. CONFIG_CAF_BLE_ADV_FAST_INT_MIN=0x0040 diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf index 2bea7a9d9d18..8bf3166fd3cd 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf @@ -20,6 +20,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf index a80574e01189..fc6e5a55f7b0 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf @@ -15,6 +15,8 @@ CONFIG_CAF_CLICK_DETECTOR=y CONFIG_CAF_LEDS=y CONFIG_DESKTOP_ROLE_HID_DONGLE=y +# Disable deprecation warnings to workaround build failures in CI if USB legacy stack is used. +CONFIG_DEPRECATION_TEST=y CONFIG_DESKTOP_DEVICE_PID=0x52DC CONFIG_DESKTOP_HID_BOOT_INTERFACE_KEYBOARD=y From 23da31388ca2c8f8dda1570229458940f02bc506 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Mon, 15 Sep 2025 13:52:28 +0200 Subject: [PATCH 33/46] applications: nrf_desktop: Fix MCUboot serial CDC ACM CI failures The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. Disable deprecation warnings to workaround build failures in CI. Jira: NCSDK-35440 Signed-off-by: Marek Pieta --- .../nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf | 3 +++ .../nrf52833dk_nrf52820/images/mcuboot/prj_release.conf | 3 +++ .../configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf | 3 +++ .../nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf | 3 +++ .../nrf52833dk_nrf52833/images/mcuboot/prj_release.conf | 3 +++ .../nrf52833dongle_nrf52833/images/mcuboot/prj.conf | 3 +++ .../nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf | 3 +++ 7 files changed, 21 insertions(+) diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf index e16b53d51af4..dec1e07e75ad 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf @@ -28,6 +28,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf index 39f005410814..4dbbd9f04dd8 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf @@ -28,6 +28,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf index 06a1943837ef..83c2bdf94ea0 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf @@ -30,6 +30,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf index 2d34d45633e8..fdde332d894f 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_dongle_small.conf @@ -32,6 +32,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf index c3eb39e83b74..1d6b40690b8d 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf @@ -32,6 +32,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf index 06a1943837ef..83c2bdf94ea0 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf @@ -30,6 +30,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf index 26ebe2e7da69..2a846e3a3ea0 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf @@ -30,6 +30,9 @@ CONFIG_GPIO=y CONFIG_GPIO_NRFX_INTERRUPT=n CONFIG_MCUBOOT_SERIAL=y CONFIG_BOOT_SERIAL_CDC_ACM=y +# The MCUboot serial recovery over USB CDC ACM still uses USB legacy stack. +# Disable deprecation warnings to workaround build failures in CI. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_UART=n # Required by USB From 094b5eadb63015d569503d75a57f571fa414f727 Mon Sep 17 00:00:00 2001 From: Graham Wacey Date: Mon, 15 Sep 2025 13:19:40 +0100 Subject: [PATCH 34/46] applications: nrf5340_audio: Updates for upmerge As using the deprecated USB stack, must turn off deprecation warnings with CONFIG_DEPRECATION_TEST=y. Change to the endpoint structure. Signed-off-by: Graham Wacey --- applications/nrf5340_audio/prj.conf | 3 +++ applications/nrf5340_audio/prj_fota.conf | 4 ++++ applications/nrf5340_audio/prj_release.conf | 4 ++++ .../src/bluetooth/bt_stream/broadcast/broadcast_sink.c | 2 +- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf index ec4855ec61a3..b4b6d7bcc7e0 100644 --- a/applications/nrf5340_audio/prj.conf +++ b/applications/nrf5340_audio/prj.conf @@ -75,3 +75,6 @@ CONFIG_BT_HCI_CORE_LOG_LEVEL_WRN=y CONFIG_BT_ISO_TX_BUF_COUNT=3 CONFIG_BT_BUF_ACL_TX_COUNT=3 CONFIG_BT_ATT_TX_COUNT=12 + +# Suppress the USB deprecation warning +CONFIG_DEPRECATION_TEST=y diff --git a/applications/nrf5340_audio/prj_fota.conf b/applications/nrf5340_audio/prj_fota.conf index 13ad6ca274d0..4a6b322fb485 100644 --- a/applications/nrf5340_audio/prj_fota.conf +++ b/applications/nrf5340_audio/prj_fota.conf @@ -86,3 +86,7 @@ CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_BT_ISO_TX_BUF_COUNT=3 CONFIG_BT_BUF_ACL_TX_COUNT=3 CONFIG_BT_ATT_TX_COUNT=12 + + +# Suppress the USB deprecation warning +CONFIG_DEPRECATION_TEST=y diff --git a/applications/nrf5340_audio/prj_release.conf b/applications/nrf5340_audio/prj_release.conf index 9065eedef8cd..5685125f9d68 100644 --- a/applications/nrf5340_audio/prj_release.conf +++ b/applications/nrf5340_audio/prj_release.conf @@ -38,3 +38,7 @@ CONFIG_BT_ATT_TX_COUNT=12 # USB VID and PID must be changed before production. # CONFIG_USB_DEVICE_VID=0x1915 # CONFIG_USB_DEVICE_PID=0x530A + + +# Suppress the USB deprecation warning +CONFIG_DEPRECATION_TEST=y diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c index c4df01001148..ff05dee870c9 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c @@ -562,7 +562,7 @@ static bool is_any_active_streams(void) { for (int i = 0; i < ARRAY_SIZE(audio_streams); i++) { if (audio_streams[i].ep != NULL && - audio_streams[i].ep->status.state == BT_BAP_EP_STATE_STREAMING) { + audio_streams[i].ep->state == BT_BAP_EP_STATE_STREAMING) { return true; } } From 2ccfa41d562ef6c87f77116ac94ca7c0044a6347 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Mon, 15 Sep 2025 16:24:56 +0200 Subject: [PATCH 35/46] applications: nrf_desktop: Suppress deprecation warnings in usb_state.c Change suppresses build warnings related to deprecated APIs of USB legacy stack if USB next stack is chosen. Jira: NCSDK-35440 Signed-off-by: Marek Pieta --- .../nrf_desktop/src/modules/usb_state.c | 51 ++++++++++++++++--- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/applications/nrf_desktop/src/modules/usb_state.c b/applications/nrf_desktop/src/modules/usb_state.c index 07249f210df0..32ed8f492357 100644 --- a/applications/nrf_desktop/src/modules/usb_state.c +++ b/applications/nrf_desktop/src/modules/usb_state.c @@ -142,6 +142,45 @@ static struct config_channel_transport cfg_chan_transport; static void report_sent(struct usb_hid_device *usb_hid, struct usb_hid_buf *buf, bool error); +/* Start - wrappers used to suppress deprecation warnings (`sdw_`) for USB legacy stack APIs. */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +static int sdw_usb_enable(usb_dc_status_callback status_cb) +{ + return usb_enable(status_cb); +} + +static int sdw_usb_wakeup_request(void) +{ + return usb_wakeup_request(); +} + +static int sdw_usb_hid_init(const struct device *dev) +{ + return usb_hid_init(dev); +} + +static void sdw_usb_hid_register_device(const struct device *dev, const uint8_t *desc, + size_t size, const struct hid_ops *op) +{ + usb_hid_register_device(dev, desc, size, op); +} + +static int sdw_usb_hid_set_proto_code(const struct device *dev, uint8_t proto_code) +{ + return usb_hid_set_proto_code(dev, proto_code); +} + +static int sdw_hid_int_ep_write(const struct device *dev, const uint8_t *data, + uint32_t data_len, uint32_t *bytes_ret) +{ + return hid_int_ep_write(dev, data, data_len, bytes_ret); +} + +#pragma GCC diagnostic pop +/* End - wrappers used to suppress deprecation warnings (`sdw_`) for USB legacy stack APIs. */ + static uint8_t usb_hid_buf_get_report_id(struct usb_hid_buf *buf) { __ASSERT_NO_MSG(buf->status_bm & USB_HID_BUF_ALLOCATED); @@ -273,7 +312,7 @@ static void usb_hid_buf_send(struct usb_hid_device *usb_hid, struct usb_hid_buf err = hid_device_submit_report(usb_hid->dev, size, data); } else { __ASSERT_NO_MSG(IS_ENABLED(CONFIG_DESKTOP_USB_STACK_LEGACY)); - err = hid_int_ep_write(usb_hid->dev, data, size, NULL); + err = sdw_hid_int_ep_write(usb_hid->dev, data, size, NULL); } if (err) { @@ -697,7 +736,7 @@ static void usb_wakeup(void) } } else { __ASSERT_NO_MSG(IS_ENABLED(CONFIG_DESKTOP_USB_STACK_LEGACY)); - err = usb_wakeup_request(); + err = sdw_usb_wakeup_request(); } if (!err) { @@ -854,13 +893,13 @@ static int usb_init_legacy_hid_device_init(struct usb_hid_device *usb_hid_dev, usb_hid_dev->hid_protocol = HID_PROTOCOL_REPORT; usb_hid_dev->report_bm = report_bm; - usb_hid_register_device(dev, hid_report_desc, hid_report_desc_size, &hid_ops); + sdw_usb_hid_register_device(dev, hid_report_desc, hid_report_desc_size, &hid_ops); int err = 0; /* Legacy way of setting HID boot protocol requires an additional API call. */ if (IS_ENABLED(CONFIG_USB_HID_BOOT_PROTOCOL)) { - err = usb_hid_set_proto_code(dev, CONFIG_DESKTOP_USB_HID_PROTOCOL_CODE); + err = sdw_usb_hid_set_proto_code(dev, CONFIG_DESKTOP_USB_HID_PROTOCOL_CODE); if (err) { LOG_ERR("usb_hid_set_proto_code failed for dev: %p (err: %d)", (void *)dev, err); @@ -868,7 +907,7 @@ static int usb_init_legacy_hid_device_init(struct usb_hid_device *usb_hid_dev, } } - err = usb_hid_init(dev); + err = sdw_usb_hid_init(dev); if (err) { LOG_ERR("usb_hid_init failed for dev: %p (err: %d)", (void *)dev, err); return err; @@ -1013,7 +1052,7 @@ static int usb_init_legacy(void) return err; } - err = usb_enable(usb_init_legacy_status_cb); + err = sdw_usb_enable(usb_init_legacy_status_cb); if (err) { LOG_ERR("usb_enable failed (err: %d)", err); return err; From fa5db435625391a8433acc90a6e14345af6443eb Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Mon, 15 Sep 2025 15:07:36 +0200 Subject: [PATCH 36/46] applications: connectivity_bridge: allow application to pass CI Add CONFIG_DEPRECATION_TEST=y to sample configuration. Application uses deprecated code and needs to be ported to the new USB device stack. Signed-off-by: Johann Fischer --- applications/connectivity_bridge/prj.conf | 2 ++ .../sysbuild/mcuboot/boards/thingy91_nrf52840.conf | 2 ++ .../sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf | 2 ++ 3 files changed, 6 insertions(+) diff --git a/applications/connectivity_bridge/prj.conf b/applications/connectivity_bridge/prj.conf index 0690f08e09e9..c53cf031329b 100644 --- a/applications/connectivity_bridge/prj.conf +++ b/applications/connectivity_bridge/prj.conf @@ -22,6 +22,8 @@ CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor" CONFIG_USB_DEVICE_SN="THINGY91 12PLACEHLDRS" # This is overridden at runtime CONFIG_USB_COMPOSITE_DEVICE=y CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384 +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y # Disk and file system CONFIG_DISK_ACCESS=y diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf index c0d18340141e..632db7c1c51a 100644 --- a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf +++ b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91_nrf52840.conf @@ -32,3 +32,5 @@ CONFIG_USB_MASS_STORAGE=n CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor" CONFIG_USB_DEVICE_VID=0x1915 CONFIG_USB_DEVICE_PID=0x520F +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf index b2d427d17a8b..4f4c1cf03c5a 100644 --- a/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf +++ b/applications/connectivity_bridge/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf @@ -33,6 +33,8 @@ CONFIG_USB_MASS_STORAGE=n CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor" CONFIG_USB_DEVICE_VID=0x1915 CONFIG_USB_DEVICE_PID=0x910A +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y CONFIG_BOOT_SERIAL_BOOT_MODE=y From 453caa9d1c06f7ca0851935d7cccda154c798d5e Mon Sep 17 00:00:00 2001 From: Johann Fischer Date: Tue, 16 Sep 2025 10:11:01 +0200 Subject: [PATCH 37/46] tests: mcuboot: external_flash: allow test to pass CI Add CONFIG_DEPRECATION_TEST=y to test configuration. Signed-off-by: Johann Fischer --- .../sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf index 8e0b8baae3c4..ddbb1f01dd8f 100644 --- a/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf +++ b/tests/modules/mcuboot/external_flash/sysbuild/mcuboot/boards/thingy53_nrf5340_cpuapp.conf @@ -16,6 +16,8 @@ CONFIG_USB_DEVICE_PRODUCT="Bootloader Thingy:53" CONFIG_USB_DEVICE_VID=0x1915 CONFIG_USB_DEVICE_PID=0x5300 CONFIG_USB_CDC_ACM=y +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y # Decrease memory footprint CONFIG_SPI=n From 480ff9cda85b7c147d1e79e67c7a1251c5c41cb9 Mon Sep 17 00:00:00 2001 From: Mateusz Michalek Date: Tue, 16 Sep 2025 12:26:00 +0200 Subject: [PATCH 38/46] sysbuild: kconfig: MCUBoot default swap mode sets MODE_SWAP_USING_MOVE as an default for NORDIC chips Signed-off-by: Mateusz Michalek --- sysbuild/Kconfig.mcuboot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index ab519a854b0e..91288366b2c2 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -154,6 +154,11 @@ choice BOOT_SIGNATURE_TYPE endchoice +choice MCUBOOT_MODE + default MCUBOOT_MODE_SWAP_USING_MOVE + +endchoice + config BOOT_SIGNATURE_TYPE_PURE bool "Verify signature directly over image" depends on SOC_SERIES_NRF54LX || SOC_SERIES_NRF54HX From 5010de9becfeb5f8323b4a9f94db4ca74968e2b7 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Tue, 16 Sep 2025 08:24:04 +0200 Subject: [PATCH 39/46] bluetooth: fast_pair: Drop TinyCrypt Fast Pair crypto backend TinyCrypt library is no longer supported by Zephyr. Jira: NCSDK-35445 Signed-off-by: Marek Pieta --- .../bluetooth/services/fast_pair/core.rst | 2 +- .../fast_pair/fp_crypto/CMakeLists.txt | 3 - .../fast_pair/fp_crypto/Kconfig.fp_crypto | 10 -- .../fast_pair/fp_crypto/fp_crypto_tinycrypt.c | 92 ------------------- 4 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 subsys/bluetooth/services/fast_pair/fp_crypto/fp_crypto_tinycrypt.c diff --git a/doc/nrf/libraries/bluetooth/services/fast_pair/core.rst b/doc/nrf/libraries/bluetooth/services/fast_pair/core.rst index c643fac9417d..459d10be1351 100644 --- a/doc/nrf/libraries/bluetooth/services/fast_pair/core.rst +++ b/doc/nrf/libraries/bluetooth/services/fast_pair/core.rst @@ -43,7 +43,7 @@ With the :kconfig:option:`CONFIG_BT_FAST_PAIR` Kconfig option enabled, the follo * :kconfig:option:`CONFIG_BT_FAST_PAIR_STORAGE_USER_RESET_ACTION` - The option enables user reset action that is executed together with the Fast Pair factory reset operation. See the :ref:`ug_bt_fast_pair_factory_reset_custom_user_reset_action` for more details. * :kconfig:option:`CONFIG_BT_FAST_PAIR_STORAGE_ACCOUNT_KEY_MAX` - The option configures maximum number of stored Account Keys. -* :kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_TINYCRYPT`, :kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_OBERON`, and :kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_PSA` - These options are used to select the cryptographic backend for Fast Pair. +* :kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_OBERON`, and :kconfig:option:`CONFIG_BT_FAST_PAIR_CRYPTO_PSA` - These options are used to select the cryptographic backend for Fast Pair. The Oberon backend is used by default. * :kconfig:option:`CONFIG_BT_FAST_PAIR_BOND_MANAGER` - The option enables the Fast Pair bond management functionality. See :ref:`ug_bt_fast_pair_gatt_service_bond_management` for more details. diff --git a/subsys/bluetooth/services/fast_pair/fp_crypto/CMakeLists.txt b/subsys/bluetooth/services/fast_pair/fp_crypto/CMakeLists.txt index bc9e2f3acbfa..e0194cc36b3b 100644 --- a/subsys/bluetooth/services/fast_pair/fp_crypto/CMakeLists.txt +++ b/subsys/bluetooth/services/fast_pair/fp_crypto/CMakeLists.txt @@ -13,9 +13,6 @@ if(CONFIG_BT_FAST_PAIR_CRYPTO_OBERON) target_sources(fp_crypto PRIVATE fp_crypto_oberon.c) target_link_libraries(fp_crypto PRIVATE nrfxlib_crypto) endif() -if(CONFIG_BT_FAST_PAIR_CRYPTO_TINYCRYPT) - target_sources(fp_crypto PRIVATE fp_crypto_tinycrypt.c) -endif() if(CONFIG_BT_FAST_PAIR_CRYPTO_PSA) target_sources(fp_crypto PRIVATE fp_crypto_psa.c) endif() diff --git a/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto b/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto index 48829c8407d5..344f45b572a4 100644 --- a/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto +++ b/subsys/bluetooth/services/fast_pair/fp_crypto/Kconfig.fp_crypto @@ -18,16 +18,6 @@ choice BT_FAST_PAIR_CRYPTO_BACKEND help Select the Fast Pair cryptographic backend. -config BT_FAST_PAIR_CRYPTO_TINYCRYPT - bool "Fast Pair with Tinycrypt cryptographic backend" - select TINYCRYPT - select TINYCRYPT_SHA256 - select TINYCRYPT_SHA256_HMAC - select TINYCRYPT_AES - select TINYCRYPT_ECC_DH - help - Select Tinycrypt cryptographic backend for Fast Pair. - config BT_FAST_PAIR_CRYPTO_OBERON bool "Fast Pair with Oberon cryptographic backend" select NRF_OBERON diff --git a/subsys/bluetooth/services/fast_pair/fp_crypto/fp_crypto_tinycrypt.c b/subsys/bluetooth/services/fast_pair/fp_crypto/fp_crypto_tinycrypt.c deleted file mode 100644 index 9d06509bfc37..000000000000 --- a/subsys/bluetooth/services/fast_pair/fp_crypto/fp_crypto_tinycrypt.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2022 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include -#include -#include -#include -#include -#include -#include "fp_crypto.h" - -int fp_crypto_sha256(uint8_t *out, const uint8_t *in, size_t data_len) -{ - struct tc_sha256_state_struct s; - - if (tc_sha256_init(&s) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_sha256_update(&s, in, data_len) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_sha256_final(out, &s) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - return 0; -} - -int fp_crypto_hmac_sha256(uint8_t *out, - const uint8_t *in, - size_t data_len, - const uint8_t *hmac_key, - size_t hmac_key_len) -{ - struct tc_hmac_state_struct s; - - if (tc_hmac_set_key(&s, hmac_key, hmac_key_len) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_hmac_init(&s) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_hmac_update(&s, in, data_len) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_hmac_final(out, FP_CRYPTO_SHA256_HASH_LEN, &s) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - return 0; -} - -int fp_crypto_aes128_ecb_encrypt(uint8_t *out, const uint8_t *in, const uint8_t *k) -{ - struct tc_aes_key_sched_struct s; - - if (tc_aes128_set_encrypt_key(&s, k) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_aes_encrypt(out, in, &s) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - return 0; -} - -int fp_crypto_aes128_ecb_decrypt(uint8_t *out, const uint8_t *in, const uint8_t *k) -{ - struct tc_aes_key_sched_struct s; - - if (tc_aes128_set_decrypt_key(&s, k) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - if (tc_aes_decrypt(out, in, &s) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - return 0; -} - -int fp_crypto_ecdh_shared_secret(uint8_t *secret_key, const uint8_t *public_key, - const uint8_t *private_key) -{ - const struct uECC_Curve_t *curve = uECC_secp256r1(); - - if (uECC_valid_public_key(public_key, curve) != 0) { - return -EINVAL; - } - if (uECC_shared_secret(public_key, private_key, secret_key, curve) != TC_CRYPTO_SUCCESS) { - return -EINVAL; - } - return 0; -} From d42ae2ca05be03b10337f5cae1721ec8b3254989 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Tue, 16 Sep 2025 08:19:50 +0200 Subject: [PATCH 40/46] tests: fast_pair: crypto: Drop unit tests for TinyCrypt TinyCrypt library is no longer supported by Zephyr. Jira: NCSDK-35445 Signed-off-by: Marek Pieta --- scripts/quarantine_integration.yaml | 1 - .../fast_pair/crypto/prj_tinycrypt.conf | 11 -------- .../bluetooth/fast_pair/crypto/testcase.yaml | 28 ------------------- 3 files changed, 40 deletions(-) delete mode 100644 tests/subsys/bluetooth/fast_pair/crypto/prj_tinycrypt.conf diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml index c25c6a8bec17..7ec4b8b76f07 100644 --- a/scripts/quarantine_integration.yaml +++ b/scripts/quarantine_integration.yaml @@ -476,7 +476,6 @@ - scenarios: - fast_pair.crypto.oberon - - fast_pair.crypto.tinycrypt - fast_pair.crypto.psa platforms: - nrf52840dk/nrf52840 diff --git a/tests/subsys/bluetooth/fast_pair/crypto/prj_tinycrypt.conf b/tests/subsys/bluetooth/fast_pair/crypto/prj_tinycrypt.conf deleted file mode 100644 index e1a13a4b12a5..000000000000 --- a/tests/subsys/bluetooth/fast_pair/crypto/prj_tinycrypt.conf +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (c) 2022-2023 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -CONFIG_ZTEST=y -CONFIG_ZTEST_SHUFFLE=y -CONFIG_ZTEST_SHUFFLE_SUITE_REPEAT_COUNT=1 -CONFIG_ZTEST_SHUFFLE_TEST_REPEAT_COUNT=2 -CONFIG_BT_FAST_PAIR_CRYPTO_TINYCRYPT=y diff --git a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml index 3b8023ae8127..908a7f1eb970 100644 --- a/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml +++ b/tests/subsys/bluetooth/fast_pair/crypto/testcase.yaml @@ -52,31 +52,3 @@ tests: tags: - sysbuild - bluetooth - fast_pair.crypto.tinycrypt: - sysbuild: true - platform_allow: - - nrf52dk/nrf52832 - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - - nrf54h20dk/nrf54h20/cpuapp - - nrf54l15dk/nrf54l05/cpuapp - - nrf54l15dk/nrf54l10/cpuapp - - nrf54l15dk/nrf54l15/cpuapp - - nrf54lm20dk/nrf54lm20a/cpuapp - - qemu_cortex_m3 - integration_platforms: - - nrf52dk/nrf52832 - - nrf52840dk/nrf52840 - - nrf5340dk/nrf5340/cpuapp - - nrf5340dk/nrf5340/cpuapp/ns - - nrf54h20dk/nrf54h20/cpuapp - - nrf54l15dk/nrf54l05/cpuapp - - nrf54l15dk/nrf54l10/cpuapp - - nrf54l15dk/nrf54l15/cpuapp - - nrf54lm20dk/nrf54lm20a/cpuapp - - qemu_cortex_m3 - extra_args: FILE_SUFFIX=tinycrypt - tags: - - sysbuild - - bluetooth From a162f0531696dadb79ae5afc87edf788e7382f20 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Wed, 9 Jul 2025 12:55:50 +0200 Subject: [PATCH 41/46] applications: nrf_desktop: Do not unset nRF5 bootloader Remove override for (now promptless) Kconfig. Remove the override to ROM_START_OFFSET, which is already changed if the partition manager is enabled. Signed-off-by: Tomasz Chyrowicz --- applications/nrf_desktop/board_configuration.rst | 3 +++ .../configuration/nrf52840dongle_nrf52840/images/b0/prj.conf | 2 -- .../nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf | 2 -- .../nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf | 2 -- .../nrf52840dongle_nrf52840/images/b0/prj_release.conf | 2 -- .../images/b0/prj_release_4llpmconn.conf | 2 -- .../configuration/nrf52840dongle_nrf52840/pm_static.yml | 3 +++ .../nrf52840dongle_nrf52840/pm_static_3bleconn.yml | 3 +++ .../nrf52840dongle_nrf52840/pm_static_4llpmconn.yml | 3 +++ .../nrf52840dongle_nrf52840/pm_static_release.yml | 3 +++ .../nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml | 3 +++ .../nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf | 3 --- .../configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf | 3 --- .../configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf | 3 --- .../configuration/nrf52840dongle_nrf52840/prj_release.conf | 3 --- .../nrf52840dongle_nrf52840/prj_release_4llpmconn.conf | 3 --- 16 files changed, 18 insertions(+), 25 deletions(-) diff --git a/applications/nrf_desktop/board_configuration.rst b/applications/nrf_desktop/board_configuration.rst index 350630123471..a9a6834f7803 100644 --- a/applications/nrf_desktop/board_configuration.rst +++ b/applications/nrf_desktop/board_configuration.rst @@ -93,6 +93,9 @@ nRF52840 USB Dongle (``nrf52840dongle/nrf52840``) and nRF52833 USB Dongle (``nrf * Bluetooth uses Nordic Semiconductor's SoftDevice link layer and is configured to act as a central. Input data comes from Bluetooth and is retransmitted to USB. * The configuration with the B0 bootloader is set as default for the ``nrf52840dongle/nrf52840`` board and with the MCUboot bootloader is set as default for the ``nrf52833dongle`` board. + * The nRF5 MBR partition (``nrf5_mbr``) added by the ``nrf52840dongle/nrf52840`` board is not used. + It is statically defined with address and size both set to zero to prevent Partition Manager from trying to place it dynamically. + The application did not switch to the ``bare`` board variant to keep backwards compatibility. nRF52820 USB Dongle (``nrf52820dongle``) * The application is configured to act as a dongle that forwards data from both mouse and keyboard. diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf index 24e531697d56..8064623bb2bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf index 24e531697d56..8064623bb2bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf index 24e531697d56..8064623bb2bd 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf index 57988ce9b55e..2aec5cc33de1 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf index 57988ce9b55e..2aec5cc33de1 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf @@ -40,8 +40,6 @@ CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n CONFIG_UART_INTERRUPT_DRIVEN=n CONFIG_ASSERT=n -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml index 161188eeac70..da460342ddfa 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static.yml @@ -38,3 +38,6 @@ s1_image: settings_storage: address: 0xfe000 size: 0x2000 +nrf5_mbr: + address: 0x0 + size: 0x0 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml index 161188eeac70..da460342ddfa 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_3bleconn.yml @@ -38,3 +38,6 @@ s1_image: settings_storage: address: 0xfe000 size: 0x2000 +nrf5_mbr: + address: 0x0 + size: 0x0 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml index 161188eeac70..da460342ddfa 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_4llpmconn.yml @@ -38,3 +38,6 @@ s1_image: settings_storage: address: 0xfe000 size: 0x2000 +nrf5_mbr: + address: 0x0 + size: 0x0 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml index 161188eeac70..da460342ddfa 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release.yml @@ -38,3 +38,6 @@ s1_image: settings_storage: address: 0xfe000 size: 0x2000 +nrf5_mbr: + address: 0x0 + size: 0x0 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml index 161188eeac70..da460342ddfa 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/pm_static_release_4llpmconn.yml @@ -38,3 +38,6 @@ s1_image: settings_storage: address: 0xfe000 size: 0x2000 +nrf5_mbr: + address: 0x0 + size: 0x0 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf index ca69ce0e8aa1..80a9a646a86d 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf @@ -38,9 +38,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf index 6e0c7de7c6e5..2b6c21060772 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf @@ -49,9 +49,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf index a7472263fb58..ed64345d450c 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf @@ -48,9 +48,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf index 2393c7932c53..e82232b5135e 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf @@ -36,9 +36,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf index 60fd4a38501f..c6561a7877c2 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf @@ -46,9 +46,6 @@ CONFIG_DESKTOP_BLE_QOS_ENABLE=y ################################################################################ # Zephyr Configuration -CONFIG_ROM_START_OFFSET=0 -CONFIG_BOARD_HAS_NRF5_BOOTLOADER=n - CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=1536 CONFIG_ISR_STACK_SIZE=1280 CONFIG_MAIN_STACK_SIZE=840 From 600511bc070701203f59d07fa18658fc51318480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Mon, 8 Sep 2025 09:16:43 +0200 Subject: [PATCH 42/46] ironside: Generate periphconf from Zephyr images instead of sysbuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rewrite the periphconf CMake code to have each individual Zephyr image generate periphconf instead of doing it from the sysbuild image. This aligns better with how upstream has moved gen_uicr.py out of SYSBUILD. Also, add a sample that uses this infrastructure. Signed-off-by: Sebastian Bøe --- CMakeLists.txt | 6 -- CODEOWNERS | 2 + cmake/sysbuild/periphconf_migrate.cmake | 66 ---------------- .../releases/release-notes-changelog.rst | 2 + doc/nrf/samples/other.rst | 1 + .../secondary_boot_gen_uicr/CMakeLists.txt | 15 ++++ .../secondary_boot_gen_uicr/README.rst | 76 +++++++++++++++++++ .../secondary_boot_gen_uicr/prj.conf | 14 ++++ .../secondary_boot_gen_uicr/sample.yaml | 26 +++++++ .../secondary/CMakeLists.txt | 11 +++ .../secondary/prj.conf | 7 ++ .../secondary/secondary_partition.overlay | 11 +++ .../secondary/src/main.c | 23 ++++++ .../secondary_boot_gen_uicr/src/main.c | 31 ++++++++ .../secondary_boot_gen_uicr/sysbuild.conf | 5 ++ .../sysbuild/uicr.conf | 6 ++ subsys/CMakeLists.txt | 1 + subsys/Kconfig | 1 + subsys/periphconf/CMakeLists.txt | 31 ++++++++ subsys/periphconf/Kconfig | 17 +++++ sysbuild/CMakeLists.txt | 5 +- sysbuild/Kconfig.periphconf | 11 --- sysbuild/Kconfig.secondary | 58 ++++++++++++++ sysbuild/Kconfig.sysbuild | 2 +- sysbuild/secondary.cmake | 24 ++++++ 25 files changed, 364 insertions(+), 88 deletions(-) delete mode 100644 cmake/sysbuild/periphconf_migrate.cmake create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/CMakeLists.txt create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/README.rst create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/prj.conf create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/sample.yaml create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/secondary/CMakeLists.txt create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/secondary/prj.conf create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/secondary/secondary_partition.overlay create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/secondary/src/main.c create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/src/main.c create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/sysbuild.conf create mode 100644 samples/ironside_se/secondary_boot_gen_uicr/sysbuild/uicr.conf create mode 100644 subsys/periphconf/CMakeLists.txt create mode 100644 subsys/periphconf/Kconfig delete mode 100644 sysbuild/Kconfig.periphconf create mode 100644 sysbuild/Kconfig.secondary create mode 100644 sysbuild/secondary.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a656e53089d7..aa5535e553a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,9 +35,3 @@ add_subdirectory(subsys) add_subdirectory(modules) add_subdirectory(drivers) add_subdirectory(tests) - -# TEMPHACK: Add a source file generated by cmake/sysbuild/periphconf_migrate.cmake -if(SYSBUILD AND CONFIG_NRF_HALTIUM_GENERATE_UICR) - file(TOUCH ${APPLICATION_BINARY_DIR}/../periphconf_migrated.c) - zephyr_sources(${APPLICATION_BINARY_DIR}/../periphconf_migrated.c) -endif() diff --git a/CODEOWNERS b/CODEOWNERS index 584ed6e2cbea..01df60eb66fd 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -526,6 +526,7 @@ /samples/nrf5340/empty_app_core/ @nrfconnect/ncs-si-muffin /samples/nrf5340/extxip_smp_svr/ @nrfconnect/ncs-pluto /samples/nrf54h20/empty_app_core/ @nrfconnect/ncs-aurora +/samples/ironside_se/ @nrfconnect/ncs-aurora /samples/nrf_compress/ @nordicjm /samples/nrf_profiler/ @nrfconnect/ncs-si-bluebagel /samples/nrf_rpc/protocols_serialization/ @nrfconnect/ncs-protocols-serialization @@ -636,6 +637,7 @@ /samples/event_manager_proxy/*.rst @nrfconnect/ncs-si-muffin-doc /samples/gazell/**/*.rst @nrfconnect/ncs-si-muffin-doc /samples/hw_id/*.rst @nrfconnect/ncs-cia-doc +/samples/ironside_se/**/*.rst @nrfconnect/ncs-aurora-doc /samples/ipc/ipc_service/*.rst @nrfconnect/ncs-si-muffin-doc /samples/keys/**/*.rst @nrfconnect/ncs-aegir-doc /samples/matter/**/*.rst @nrfconnect/ncs-matter-doc diff --git a/cmake/sysbuild/periphconf_migrate.cmake b/cmake/sysbuild/periphconf_migrate.cmake deleted file mode 100644 index e1b43ddbe957..000000000000 --- a/cmake/sysbuild/periphconf_migrate.cmake +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -# This file includes extra sysbuild POST_CMAKE logic to assist with -# autogenerating an IronSide SE compatible UICR. -# -# It is enabled when SB_CONFIG_NRF_PERIPHCONF_MIGRATE=y is set and -# one of the sysbuild images has CONFIG_NRF_HALTIUM_GENERATE_UICR=y. -# It uses nrf-regtool to produce an extra source file for that image -# (periphconf_migrated.c) based on multiple image devicetrees. -# -# NOTE: This is a temporary solution for NCS. The planned solution -# for upstream Zephyr will not require nrf-regtool. - -set(ironside_uicr_images "") -set(ironside_uicr_main_image) -foreach(image ${POST_CMAKE_IMAGES}) - sysbuild_get(${image}_54h20_app IMAGE ${image} VAR CONFIG_SOC_NRF54H20_CPUAPP KCONFIG) - sysbuild_get(${image}_54h20_rad IMAGE ${image} VAR CONFIG_SOC_NRF54H20_CPURAD KCONFIG) - if(${image}_54h20_app OR ${image}_54h20_rad) - list(APPEND ironside_uicr_images ${image}) - if(NOT DEFINED ironside_uicr_main_image) - sysbuild_get(image_generates_uicr IMAGE ${image} VAR CONFIG_NRF_HALTIUM_GENERATE_UICR KCONFIG) - if(image_generates_uicr) - set(ironside_uicr_main_image ${image}) - endif() - endif() - endif() -endforeach() -if(DEFINED ironside_uicr_main_image) - find_program(NRF_REGTOOL nrf-regtool REQUIRED) - set(nrf_regtool_cmd - COMMAND - ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src - ${NRF_REGTOOL} - ) - ExternalProject_Get_Property(${ironside_uicr_main_image} BINARY_DIR) - set(nrf_regtool_migrate_cmd - ${nrf_regtool_cmd} - uicr-migrate - --edt-pickle-file ${BINARY_DIR}/zephyr/edt.pickle - --output-periphconf-file ${APPLICATION_BINARY_DIR}/periphconf_migrated.c - ) - foreach(image ${ironside_uicr_images}) - ExternalProject_Get_Property(${image} BINARY_DIR) - sysbuild_get(image_soc IMAGE ${image} VAR CONFIG_SOC KCONFIG) - set(image_uicr_hex ${PROJECT_BINARY_DIR}/uicr_${image}.hex) - message(STATUS "Running nrf-regtool uicr-compile for ${image}") - execute_process( - ${nrf_regtool_cmd} - uicr-compile - --edt-pickle-file ${BINARY_DIR}/zephyr/edt.pickle - --product-name ${image_soc} - --output-file ${image_uicr_hex} - WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) - list(APPEND nrf_regtool_migrate_cmd --uicr-hex-file ${image_uicr_hex}) - endforeach() - message(STATUS "Running nrf-regtool uicr-migrate for ${ironside_uicr_main_image}") - execute_process( - ${nrf_regtool_migrate_cmd} - WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} - COMMAND_ERROR_IS_FATAL ANY - ) -endif() diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 3f357a993eef..f44ab7a31490 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -494,6 +494,8 @@ Wi-Fi samples Other samples ------------- +* Added the :ref:`secondary_boot_sample` sample that demonstrates how to build and boot a secondary application image on the nRF54H20 DK. + * :ref:`nrf_profiler_sample` sample: * Added a new testing step demonstrating how to calculate event propagation statistics. diff --git a/doc/nrf/samples/other.rst b/doc/nrf/samples/other.rst index 0e8e34e5d9db..b384de51aae2 100644 --- a/doc/nrf/samples/other.rst +++ b/doc/nrf/samples/other.rst @@ -21,5 +21,6 @@ This section lists single |NCS| samples for various uses that are not part of ot ../../../samples/mpsl/*/README ../../../samples/benchmarks/*/README ../../../samples/nrf_compress/*/README + ../../../samples/ironside_se/*/README ../../../tests/benchmarks/multicore/*/README ../../../samples/zephyr/smp_svr_mini_boot/README diff --git a/samples/ironside_se/secondary_boot_gen_uicr/CMakeLists.txt b/samples/ironside_se/secondary_boot_gen_uicr/CMakeLists.txt new file mode 100644 index 000000000000..703bd686cd8d --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +cmake_minimum_required(VERSION 3.13.1) + +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) + +project(secondary_boot_primary) + +target_sources(app PRIVATE + src/main.c + ) diff --git a/samples/ironside_se/secondary_boot_gen_uicr/README.rst b/samples/ironside_se/secondary_boot_gen_uicr/README.rst new file mode 100644 index 000000000000..3fa62dea7a90 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/README.rst @@ -0,0 +1,76 @@ +.. _secondary_boot_sample: + +Secondary boot +############## + +.. contents:: + :local: + :depth: 2 + +This sample demonstrates how to boot a secondary application image on the nRF54H20 DK board, where both the primary and secondary application images print ``Hello World`` messages. + +Requirements +************ + +The sample supports the following development kit: + +.. table-from-sample-yaml:: + +Overview +******** + +The sample consists of two applications: + +* *Primary Image*: Runs initially on the application core (``cpuapp``), prints a ``Hello World`` message, and includes stub functions for the Secure Domain service calls to boot the secondary image. + +* *Secondary Image*: Runs on the same application core (``cpuapp/secondary``) after the primary image initiates the boot sequence and prints its own ``Hello World`` message. + +Building and running +******************** + +.. |sample path| replace:: :file:`samples/ironside_se/secondary_boot_gen_uicr` + +.. include:: /includes/build_and_run_ns.txt + +To build the sample for the nRF54H20 DK, run the following command: + +.. code-block:: console + + west build -b nrf54h20dk/nrf54h20/cpuapp samples/secondary_boot --sysbuild + +The ``--sysbuild`` flag is required as this sample builds multiple images. + +To program the sample on the device, run the following command: + +.. code-block:: console + + west flash + +Testing +******* + +After programming the test to your development kit, complete the following steps to test it: + +1. |connect_terminal| +#. Reset the kit. +#. Observe the console output for both cores: + + +.. code-block:: console + + [00:00:00.123,456] === Hello World from Primary Image === + [00:00:00.456,789] === Hello World from Secondary Image === + +Dependencies +************ + +This sample uses the following |NCS| subsystems: + +* IronSide SE bootmode service - Provides the interface to boot into secondary firmware mode +* Sysbuild - Enables building multiple images in a single build process +* UICR generation - Configures the User Information Configuration Registers for secondary boot mode + +In addition, it uses the following Zephyr subsystems: + +* :ref:`Kernel ` - Provides basic system functionality and threading +* :ref:`Console ` - Enables UART console output for debugging and user interaction diff --git a/samples/ironside_se/secondary_boot_gen_uicr/prj.conf b/samples/ironside_se/secondary_boot_gen_uicr/prj.conf new file mode 100644 index 000000000000..cbfdc2f03586 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/prj.conf @@ -0,0 +1,14 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Enable console and UART +CONFIG_CONSOLE=y +CONFIG_UART_CONSOLE=y + +# Enable printk +CONFIG_PRINTK=y + +CONFIG_NRF_IRONSIDE_BOOTMODE_SERVICE=y diff --git a/samples/ironside_se/secondary_boot_gen_uicr/sample.yaml b/samples/ironside_se/secondary_boot_gen_uicr/sample.yaml new file mode 100644 index 000000000000..871bd4045cf8 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/sample.yaml @@ -0,0 +1,26 @@ +sample: + name: Secondary Boot Sample + description: | + Sample demonstrating secondary application image boot on nRF54H20DK. + The primary image prints hello world, calls stub functions for UICR + update and secure domain service to boot the secondary image. The + secondary image prints its own hello world message. + +common: + sysbuild: true + harness: console + harness_config: + type: multi_line + regex: + - "=== Hello World from Primary Image ===" + - "=== Hello World from Secondary Image ===" + +tests: + samples.secondary_boot.nrf54h20dk: + tags: + - sysbuild + - ci_samples_secondary_boot + platform_allow: + - nrf54h20dk/nrf54h20/cpuapp + integration_platforms: + - nrf54h20dk/nrf54h20/cpuapp diff --git a/samples/ironside_se/secondary_boot_gen_uicr/secondary/CMakeLists.txt b/samples/ironside_se/secondary_boot_gen_uicr/secondary/CMakeLists.txt new file mode 100644 index 000000000000..994296c8a0ab --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/secondary/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +cmake_minimum_required(VERSION 3.13.1) +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) +project(secondary_boot_secondary) + +# Create empty marker file at configure-time +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/is_secondary_firmware.txt "") + +target_sources(app PRIVATE src/main.c) diff --git a/samples/ironside_se/secondary_boot_gen_uicr/secondary/prj.conf b/samples/ironside_se/secondary_boot_gen_uicr/secondary/prj.conf new file mode 100644 index 000000000000..0f13ac32bbac --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/secondary/prj.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) 2025 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# NB: Using device tree overlay to set chosen code-partition to secondary_partition diff --git a/samples/ironside_se/secondary_boot_gen_uicr/secondary/secondary_partition.overlay b/samples/ironside_se/secondary_boot_gen_uicr/secondary/secondary_partition.overlay new file mode 100644 index 000000000000..c8b66d51a8b3 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/secondary/secondary_partition.overlay @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + zephyr,code-partition = &secondary_partition; + }; +}; diff --git a/samples/ironside_se/secondary_boot_gen_uicr/secondary/src/main.c b/samples/ironside_se/secondary_boot_gen_uicr/secondary/src/main.c new file mode 100644 index 000000000000..abd28ff00906 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/secondary/src/main.c @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA. + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include +#include + +int main(void) +{ + printk("=== Hello World from Secondary Image ===\n"); + + printk("Secondary image initialization complete\n"); + + /* Keep the secondary image running */ + while (1) { + k_msleep(3000); + printk("Secondary image heartbeat\n"); + } + + return 0; +} diff --git a/samples/ironside_se/secondary_boot_gen_uicr/src/main.c b/samples/ironside_se/secondary_boot_gen_uicr/src/main.c new file mode 100644 index 000000000000..c8d3659d7013 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/src/main.c @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA. + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include +#include +#include +#include + +int main(void) +{ + int err; + + printk("=== Hello World from Primary Image ===\n"); + + printk("Booting secondary image\n"); + err = ironside_bootmode_secondary_reboot(NULL, 0); + if (err != 0) { + printk("Secondary image boot failed: %d\n", err); + return err; + } + + while (1) { + printk("FAILURE: Primary should not be running - secondary boot failed\n"); + k_msleep(1000); + } + + return 0; +} diff --git a/samples/ironside_se/secondary_boot_gen_uicr/sysbuild.conf b/samples/ironside_se/secondary_boot_gen_uicr/sysbuild.conf new file mode 100644 index 000000000000..cd73f148a7c8 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/sysbuild.conf @@ -0,0 +1,5 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# Select secondary boot image with UICR generation +SB_CONFIG_SECONDARY_BOOT_GEN_UICR=y diff --git a/samples/ironside_se/secondary_boot_gen_uicr/sysbuild/uicr.conf b/samples/ironside_se/secondary_boot_gen_uicr/sysbuild/uicr.conf new file mode 100644 index 000000000000..e31cfbe35997 --- /dev/null +++ b/samples/ironside_se/secondary_boot_gen_uicr/sysbuild/uicr.conf @@ -0,0 +1,6 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# Configuration overlay for uicr image +# Enable UICR.SECONDARY.ENABLE +CONFIG_GEN_UICR_SECONDARY=y diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt index 27ddef01503b..02dc7bdb0e6e 100644 --- a/subsys/CMakeLists.txt +++ b/subsys/CMakeLists.txt @@ -62,6 +62,7 @@ add_subdirectory_ifdef(CONFIG_AUDIO_MODULE audio_module) add_subdirectory_ifdef(CONFIG_AUDIO_MODULE_TEMPLATE audio/audio_module_template) add_subdirectory_ifdef(CONFIG_UART_ASYNC_ADAPTER uart_async_adapter) add_subdirectory_ifdef(CONFIG_SDFW_SERVICES_ENABLED sdfw_services) +add_subdirectory_ifdef(CONFIG_NRF_PERIPHCONF_MIGRATE periphconf) add_subdirectory_ifdef(CONFIG_DULT dult) add_subdirectory_ifdef(CONFIG_NRF_COMPRESS nrf_compress) add_subdirectory(mgmt/mcumgr) diff --git a/subsys/Kconfig b/subsys/Kconfig index 9444bcd23f26..5b85178dc64a 100644 --- a/subsys/Kconfig +++ b/subsys/Kconfig @@ -36,6 +36,7 @@ rsource "audio/audio_module_template/Kconfig" rsource "uart_async_adapter/Kconfig" rsource "trusted_storage/Kconfig" rsource "secure_storage/Kconfig" +rsource "periphconf/Kconfig" rsource "logging/Kconfig" rsource "sdfw_services/Kconfig" rsource "dult/Kconfig" diff --git a/subsys/periphconf/CMakeLists.txt b/subsys/periphconf/CMakeLists.txt new file mode 100644 index 000000000000..ff60db0e198e --- /dev/null +++ b/subsys/periphconf/CMakeLists.txt @@ -0,0 +1,31 @@ +# Copyright (c) 2025 Nordic Semiconductor ASA +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +find_program(NRF_REGTOOL nrf-regtool REQUIRED) + +execute_process( + COMMAND + ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src + ${NRF_REGTOOL} + uicr-compile + --edt-pickle-file ${EDT_PICKLE} + --product-name ${CONFIG_SOC} + --output-file ${PROJECT_BINARY_DIR}/uicr_legacy.hex + WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} + COMMAND_ERROR_IS_FATAL ANY + ) + +execute_process( + COMMAND + ${CMAKE_COMMAND} -E env PYTHONPATH=${ZEPHYR_BASE}/scripts/dts/python-devicetree/src + ${NRF_REGTOOL} + uicr-migrate + --edt-pickle-file ${EDT_PICKLE} + --uicr-hex-file ${PROJECT_BINARY_DIR}/uicr_legacy.hex + --output-periphconf-file ${PROJECT_BINARY_DIR}/periphconf_migrated.c + WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR} + COMMAND_ERROR_IS_FATAL ANY + ) +message(STATUS "Generated periphconf_migrated.c: ${PROJECT_BINARY_DIR}/periphconf_migrated.c") + +zephyr_sources(${PROJECT_BINARY_DIR}/periphconf_migrated.c) diff --git a/subsys/periphconf/Kconfig b/subsys/periphconf/Kconfig new file mode 100644 index 000000000000..d26c25eaa839 --- /dev/null +++ b/subsys/periphconf/Kconfig @@ -0,0 +1,17 @@ +# Copyright (c) 2025 Nordic Semiconductor +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# Periphconf integration + +config NRF_PERIPHCONF_MIGRATE + bool "Generate periphconf_migrated.c" + default y + depends on SOC_NRF54H20_CPURAD || SOC_NRF54H20_CPUAPP + help + Enable autogenerating UICR.PERIPHCONF tables to migrate an + existing project for running with IronSide SE. Disable when + providing your own UICR.PERIPHCONF file. + + Note that PPR and FLPR are in the global domain, and + generation of periphconf_migrated.c is only supported for local + domains. diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 0611e69d7b39..bea96b6b5ed3 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -859,10 +859,6 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${BINARY_DIR}/zephyr/.config) endif() endif() - - if(SB_CONFIG_NRF_PERIPHCONF_MIGRATE) - include(${ZEPHYR_NRF_MODULE_DIR}/cmake/sysbuild/periphconf_migrate.cmake) - endif() endfunction(${SYSBUILD_CURRENT_MODULE_NAME}_post_cmake) # Enable use of partition manager with sysbuild. @@ -874,6 +870,7 @@ include(ncs_sysbuild_extensions) include(${CMAKE_CURRENT_LIST_DIR}/extensions.cmake) include(${CMAKE_CURRENT_LIST_DIR}/appcore.cmake) include(${CMAKE_CURRENT_LIST_DIR}/netcore.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/secondary.cmake) include(${CMAKE_CURRENT_LIST_DIR}/secureboot.cmake) include(${CMAKE_CURRENT_LIST_DIR}/mcuboot.cmake) include(${CMAKE_CURRENT_LIST_DIR}/hpf.cmake) diff --git a/sysbuild/Kconfig.periphconf b/sysbuild/Kconfig.periphconf deleted file mode 100644 index 812165863d1b..000000000000 --- a/sysbuild/Kconfig.periphconf +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config NRF_PERIPHCONF_MIGRATE - bool "Generate periphconf_migrated.c" - default y - depends on SOC_SERIES_NRF54HX - help - Enable autogenerating UICR.PERIPHCONF tables for multi-image builds, - to migrate an existing project for running with IronSide SE. - You can disable this if you have your own UICR.PERIPHCONF file. diff --git a/sysbuild/Kconfig.secondary b/sysbuild/Kconfig.secondary new file mode 100644 index 000000000000..d68f07c90ec5 --- /dev/null +++ b/sysbuild/Kconfig.secondary @@ -0,0 +1,58 @@ +# Copyright (c) 2025 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +config SUPPORT_SECONDARY + bool + default y if SOC_NRF54H20_CPUAPP + +config SECONDARY_REMOTE_BOARD_TARGET_CPUCLUSTER + string + default "cpuapp" if SOC_NRF54H20_CPUAPP + +menu "Secondary core configuration" + depends on SUPPORT_SECONDARY + +config SUPPORT_SECONDARY_BOOT_GEN_UICR + bool + default y + +config NRF_DEFAULT_SECONDARY_BOOT + bool + +choice SECONDARY + prompt "Secondary image" + default SECONDARY_BOOT_GEN_UICR if NRF_DEFAULT_SECONDARY_BOOT && SECONDARY_REMOTE_BOARD_TARGET_CPUCLUSTER != "" + depends on SUPPORT_SECONDARY + +config SECONDARY_NONE + bool "None" + help + Do not include a secondary image in the build. + +config SECONDARY_BOOT_GEN_UICR + bool "Secondary Boot with UICR generation" + depends on SUPPORT_SECONDARY_BOOT_GEN_UICR + help + Include secondary boot sample with UICR generation as the secondary image to use. + This demonstrates secondary application boot with PERIPHCONF migration. + +endchoice + +if !SECONDARY_NONE + +config SECONDARY_IMAGE_NAME + string + default "secondary" if SECONDARY_BOOT_GEN_UICR + help + Name of secondary image. + +config SECONDARY_IMAGE_PATH + string + default "${ZEPHYR_NRF_MODULE_DIR}/samples/ironside_se/secondary_boot_gen_uicr/secondary" if SECONDARY_BOOT_GEN_UICR + help + Source directory of secondary image. + +endif # !SECONDARY_NONE + +endmenu diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index beb33dd01f5b..0c096b3a9d27 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -71,6 +71,7 @@ rsource "Kconfig.appcore" rsource "Kconfig.flprcore" rsource "Kconfig.netcore" rsource "Kconfig.pprcore" +rsource "Kconfig.secondary" rsource "Kconfig.secureboot" rsource "Kconfig.mcuboot" rsource "Kconfig.dfu" @@ -84,5 +85,4 @@ rsource "Kconfig.approtect" rsource "Kconfig.lwm2m_carrier" rsource "Kconfig.cracen" rsource "Kconfig.tfm" -rsource "Kconfig.periphconf" rsource "Kconfig.firmware_loader" diff --git a/sysbuild/secondary.cmake b/sysbuild/secondary.cmake new file mode 100644 index 000000000000..cd57fd4dae56 --- /dev/null +++ b/sysbuild/secondary.cmake @@ -0,0 +1,24 @@ +# +# Copyright (c) 2025 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + +# Include secondary image if enabled +if(SB_CONFIG_SUPPORT_SECONDARY AND NOT SB_CONFIG_SECONDARY_NONE AND DEFINED SB_CONFIG_SECONDARY_IMAGE_NAME) + # Calculate the secondary board target + string(REPLACE "/" ";" split_board_qualifiers "${BOARD_QUALIFIERS}") + list(GET split_board_qualifiers 1 target_soc) + list(GET split_board_qualifiers 2 target_cpucluster) + set(board_target_secondary "${BOARD}/${target_soc}/${SB_CONFIG_SECONDARY_REMOTE_BOARD_TARGET_CPUCLUSTER}") + set(target_soc) + set(target_cpucluster) + + ExternalZephyrProject_Add( + APPLICATION ${SB_CONFIG_SECONDARY_IMAGE_NAME} + SOURCE_DIR ${SB_CONFIG_SECONDARY_IMAGE_PATH} + BOARD ${board_target_secondary} + BOARD_REVISION ${BOARD_REVISION} + ) + + set(board_target_secondary) +endif() From 473b63b4c59e9b5d92f2157b2c4573fd422fcd2a Mon Sep 17 00:00:00 2001 From: Dominik Kilian Date: Tue, 16 Sep 2025 15:30:51 +0200 Subject: [PATCH 43/46] samples: nfc: writable_ndef_msg: Select config CRC when ZMS is enabled The sample in Kconfig sets default ZMS to 'y', but ZMS also must select CRC. It is done in different place, but because how Kconfig works it must be also set here. Jira: NCSDK-35447 Jira: NCSDK-35446 Signed-off-by: Dominik Kilian --- samples/nfc/writable_ndef_msg/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/nfc/writable_ndef_msg/Kconfig b/samples/nfc/writable_ndef_msg/Kconfig index 570b643db1fc..368c0c89bd14 100644 --- a/samples/nfc/writable_ndef_msg/Kconfig +++ b/samples/nfc/writable_ndef_msg/Kconfig @@ -7,6 +7,7 @@ source "Kconfig.zephyr" config ZMS + select CRC default y if (SOC_FLASH_NRF_RRAM || SOC_FLASH_NRF_MRAM) config NVS From 39e6a014c3831fb480ad5e5382395b5b83c61ea5 Mon Sep 17 00:00:00 2001 From: Carles Cufi Date: Wed, 17 Sep 2025 11:03:33 +0200 Subject: [PATCH 44/46] doc: Add missing dependency: sphinxcontrib.programoutput Add this missing dependency which is used in the Zephyr doc build. Signed-off-by: Carles Cufi --- doc/nrf/conf.py | 1 + doc/requirements.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/nrf/conf.py b/doc/nrf/conf.py index 6e9f5b7a56e6..80a72d9d90b9 100644 --- a/doc/nrf/conf.py +++ b/doc/nrf/conf.py @@ -57,6 +57,7 @@ "ncs_tool_versions", "page_filter", "sphinxcontrib.plantuml", + "sphinxcontrib.programoutput", ] linkcheck_ignore = [ diff --git a/doc/requirements.txt b/doc/requirements.txt index a8473506b343..186e87011652 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -26,5 +26,6 @@ sphinx-togglebutton # | X | | | | | sphinx_markdown_tables # | | | X | | | | | sphinxcontrib-mscgen # | X | | | | X | | | sphinxcontrib-plantuml>=0.27 # | | | | | | X | | +sphinxcontrib-programoutput # | X | | | | | | X | west>=1.0.0 # | | | | | | | X | python-dotenv # | | X | | | | | | From 5cea0c58953c96bb7582ce733addd4644eff04e3 Mon Sep 17 00:00:00 2001 From: Arkadiusz Balys Date: Wed, 17 Sep 2025 10:49:16 +0200 Subject: [PATCH 45/46] samples: openthread: Drop support for L2 in coprocessor L2 variant is not needed in coprocessor sample. We can use there only the raw nrf-radio version. Signed-off-by: Arkadiusz Balys --- samples/openthread/coprocessor/README.rst | 2 -- samples/openthread/coprocessor/sample.yaml | 21 ------------------- .../coprocessor/snippets/l2/l2.conf | 21 ------------------- .../coprocessor/snippets/l2/snippet.yml | 9 -------- 4 files changed, 53 deletions(-) delete mode 100644 samples/openthread/coprocessor/snippets/l2/l2.conf delete mode 100644 samples/openthread/coprocessor/snippets/l2/snippet.yml diff --git a/samples/openthread/coprocessor/README.rst b/samples/openthread/coprocessor/README.rst index 0b4ab8550c98..a362c5510ddf 100644 --- a/samples/openthread/coprocessor/README.rst +++ b/samples/openthread/coprocessor/README.rst @@ -121,8 +121,6 @@ The following snippets are available: The ``usb`` snippet does not support the ``nrf54l15dk/nrf54l15/cpuapp``, ``nrf54l15dk/nrf54l10/cpuapp`` and ``nrf54l15dk/nrf54l05/cpuapp`` board targets. * ``hci`` - Enables support for the Bluetooth HCI interface parallel to :ref:`Thread RCP `. -* ``l2`` - Enables the Zephyr networking layer. -* ``logging_l2`` - Enables logging from the Zephyr networking layer. FEM support =========== diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 822fd30c03b3..913aadf41dee 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -88,24 +88,3 @@ tests: - nrf21540dk/nrf52840 integration_platforms: - nrf52840dk/nrf52840 - sample.openthread.coprocessor.l2: - sysbuild: true - build_only: true - tags: - - ci_build - - sysbuild - - ci_samples_openthread - platform_allow: - - nrf52840dk/nrf52840 - - nrf54l15dk/nrf54l15/cpuapp - - nrf54l15dk/nrf54l10/cpuapp - - nrf54lm20dk/nrf54lm20a/cpuapp - - nrf54l15dk/nrf54l15/cpuapp/ns - extra_args: - - coprocessor_SNIPPET="ci;l2" - integration_platforms: - - nrf52840dk/nrf52840 - - nrf54l15dk/nrf54l15/cpuapp - - nrf54l15dk/nrf54l10/cpuapp - - nrf54lm20dk/nrf54lm20a/cpuapp - - nrf54l15dk/nrf54l15/cpuapp/ns diff --git a/samples/openthread/coprocessor/snippets/l2/l2.conf b/samples/openthread/coprocessor/snippets/l2/l2.conf deleted file mode 100644 index 07f8fa07e657..000000000000 --- a/samples/openthread/coprocessor/snippets/l2/l2.conf +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright (c) 2025 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - - -# Enable Zephyr's OpenThread L2 layer -CONFIG_NET_L2_OPENTHREAD=y - -# Enable networking required by L2 layer -CONFIG_NETWORKING=y - -# Enable Zperf -CONFIG_NET_SHELL=y -CONFIG_NET_ZPERF=y -CONFIG_NET_ZPERF_SERVER=y -CONFIG_NET_CONTEXT_RCVTIMEO=y -CONFIG_NET_SOCKETS=y -CONFIG_ZVFS_OPEN_MAX=9 -CONFIG_NET_SOCKETS_POLL_MAX=9 diff --git a/samples/openthread/coprocessor/snippets/l2/snippet.yml b/samples/openthread/coprocessor/snippets/l2/snippet.yml deleted file mode 100644 index e3f6dee4160e..000000000000 --- a/samples/openthread/coprocessor/snippets/l2/snippet.yml +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2025 Nordic Semiconductor -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -name: l2 -append: - EXTRA_CONF_FILE: l2.conf From b5b33e79d5a3d1b94207da0d6515591eeb4dedf0 Mon Sep 17 00:00:00 2001 From: Piotr Pryga Date: Wed, 17 Sep 2025 11:53:45 +0200 Subject: [PATCH 46/46] tests: bluetooth: iso: Fix use of undefined variable err There was used an err variable to store return from bt_le_ext_adv_set_data(). That variable was not declared. The commit fixes compilation error. Signed-off-by: Piotr Pryga --- tests/bluetooth/iso/modules/peripheral.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/bluetooth/iso/modules/peripheral.c b/tests/bluetooth/iso/modules/peripheral.c index d10cffd3f04e..e2e2612ceb80 100644 --- a/tests/bluetooth/iso/modules/peripheral.c +++ b/tests/bluetooth/iso/modules/peripheral.c @@ -149,9 +149,9 @@ static int peripheral_init(void) } /* Set the advertising data */ - err = bt_le_ext_adv_set_data(adv_ext, adv_data, ARRAY_SIZE(adv_data), NULL, 0); - if (err) { - LOG_ERR("Failed to set advertising data. Err: %d", err); + ret = bt_le_ext_adv_set_data(adv_ext, adv_data, ARRAY_SIZE(adv_data), NULL, 0); + if (ret) { + LOG_ERR("Failed to set advertising data. Err: %d", ret); return; }