From ca49f688908e1c24e1d6f877e4f605a2e22339b4 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Thu, 16 May 2024 14:36:10 +0200 Subject: [PATCH 01/39] manifest: Pull upmerged repositories Pull upmerged sdk-zephyr and sdk-mcuboot repositories. Pull fixes in matter and find-my, sidewalk, trusted-firmware-m. Signed-off-by: Robert Lubos --- west.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/west.yml b/west.yml index c5bb2d3db916..57be93aa3e30 100644 --- a/west.yml +++ b/west.yml @@ -63,7 +63,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 41095df79d11e081ea96d150fbe3dbd93f73af6c + revision: a1769aba631b078769d182eaaea13aafc09039bc import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -131,7 +131,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: f67a11a8b4f6fff87641be346c4744ea059bffd7 + revision: f1e1675630561a745d28107144e9a863860204cf path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -152,7 +152,7 @@ manifest: - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m - revision: 39a386c797428a82d77c2b173a6b028af565f03c + revision: 92a5b4ffa527a1d9fb00924c227536e46169bd6e - name: psa-arch-tests repo-path: sdk-psa-arch-tests path: modules/tee/tf-m/psa-arch-tests @@ -160,7 +160,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 78d81b482013968eecd75bc5e8824d92d65ed429 + revision: 28ebd4379d0da0ededb933c3075992ff79589775 west-commands: scripts/west/west-commands.yml submodules: - name: nlio @@ -203,12 +203,12 @@ manifest: compare-by-default: false - name: sidewalk repo-path: sdk-sidewalk - revision: 94f3d07bf4cb29bcb380a6c35756afd9763e89ec + revision: 50a9f476e54f395bac6e7c1ca798fadf1ff95a94 groups: - sidewalk - name: find-my repo-path: sdk-find-my - revision: 8e41fe781000e0b03dc2d75f129599b374b8d7cd + revision: 813003d38bf5fab56daed9e055ddf0d03d2489a3 groups: - find-my - name: azure-sdk-for-c From a6b21d7f7ce4e3e61885c5e6c677a5343c4d89c1 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Thu, 16 May 2024 15:08:18 +0200 Subject: [PATCH 02/39] doc: mcuboot: Make sure PORTING.md is visible PORTING.md is now referenced by other docs, hence make sure it's visible during doc build. Signed-off-by: Robert Lubos --- doc/mcuboot/conf.py | 1 + doc/mcuboot/unused_files.rst | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/mcuboot/conf.py b/doc/mcuboot/conf.py index 618389948271..7ebe60aa6791 100644 --- a/doc/mcuboot/conf.py +++ b/doc/mcuboot/conf.py @@ -78,6 +78,7 @@ (MCUBOOT_BASE / "docs", "encrypted_images.md"), (MCUBOOT_BASE / "docs", "imgtool.md"), (MCUBOOT_BASE / "docs", "ecdsa.md"), + (MCUBOOT_BASE / "docs", "PORTING.md"), (MCUBOOT_BASE / "docs", "readme-zephyr.md"), (MCUBOOT_BASE / "docs", "testplan-mynewt.md"), (MCUBOOT_BASE / "docs", "testplan-zephyr.md"), diff --git a/doc/mcuboot/unused_files.rst b/doc/mcuboot/unused_files.rst index d526b8a65677..23106979a152 100644 --- a/doc/mcuboot/unused_files.rst +++ b/doc/mcuboot/unused_files.rst @@ -7,3 +7,4 @@ signed_images.md readme-zephyr.md testplan-zephyr.md + PORTING.md From ae5208f8bef6ee63bd712e34201efca91de8b25b Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Thu, 16 May 2024 15:44:57 +0200 Subject: [PATCH 03/39] bluetooth: Don't reference removed Kconfig symbols Specifically NET_L2_BT and NET_L2_BT_SHELL. Signed-off-by: Robert Lubos --- subsys/bluetooth/rpc/Kconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/subsys/bluetooth/rpc/Kconfig b/subsys/bluetooth/rpc/Kconfig index b9e31efc1408..fa066c52c569 100644 --- a/subsys/bluetooth/rpc/Kconfig +++ b/subsys/bluetooth/rpc/Kconfig @@ -18,8 +18,6 @@ config BT_RPC depends on !BT_HCI_RAW depends on !BT_DF depends on !BT_OTS - depends on !NET_L2_BT - depends on !NET_L2_BT_SHELL depends on !BT_CLASSIC help Enables Bluetooth serialization over RPC From 3dbff88cd63c03903ec3f3097df21d285c8ebd23 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Fri, 17 May 2024 11:39:02 +0200 Subject: [PATCH 04/39] bluetooth: Remove CONFIG_BT_HCI_RAW_RESERVE d590bcb5e00b410d5a8631b17d837bc0027d4841 removed the CONFIG_BT_HCI_RAW_RESERVE Kconfig option. Align NCS to the change. Jira: NCSDK-27508 Signed-off-by: Marek Pieta --- applications/ipc_radio/overlay-bt_hci_ipc.conf | 1 - applications/machine_learning/sysbuild/hci_ipc/prj.conf | 1 - applications/matter_bridge/sysbuild/hci_ipc/prj.conf | 1 - .../sysbuild/multiprotocol_rpmsg/prj.conf | 1 - .../nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf | 1 - .../nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf | 1 - .../nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj.conf | 1 - .../nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj_release.conf | 1 - samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf | 1 - .../direction_finding_central/sysbuild/hci_ipc/prj.conf | 1 - .../sysbuild/hci_ipc/prj.conf | 1 - .../sysbuild/hci_ipc/prj.conf | 1 - .../direction_finding_peripheral/sysbuild/hci_ipc/prj.conf | 1 - .../bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf | 2 -- .../bluetooth/fast_pair/locator_tag/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf | 1 - .../bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf | 1 - .../peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf | 1 - samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf | 1 - .../peripheral_power_profiling/sysbuild/hci_ipc/prj.conf | 1 - .../sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf | 1 - samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf | 1 - samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf | 1 - samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf | 1 - samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - .../light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf | 1 - samples/matter/light_switch/sysbuild/hci_ipc/prj.conf | 1 - .../matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - samples/matter/lock/sysbuild/hci_ipc/prj.conf | 1 - samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - .../matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf | 1 - samples/matter/template/sysbuild/hci_ipc/prj.conf | 1 - samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - .../template/sysbuild/multiprotocol_rpmsg/prj_release.conf | 1 - samples/matter/thermostat/sysbuild/hci_ipc/prj.conf | 1 - samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - samples/matter/window_covering/sysbuild/hci_ipc/prj.conf | 1 - .../window_covering/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - .../sysbuild/multiprotocol_rpmsg/prj_release.conf | 1 - samples/nrf5340/multiprotocol_rpmsg/prj.conf | 1 - samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - .../coap_client/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - samples/wifi/ble_coex/sysbuild/hci_ipc/prj.conf | 1 - samples/wifi/provisioning/ble/sysbuild/hci_ipc/prj.conf | 1 - .../boards/nrf5340dk_nrf5340_cpunet_fota.conf | 1 - .../zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf | 1 - 54 files changed, 55 deletions(-) diff --git a/applications/ipc_radio/overlay-bt_hci_ipc.conf b/applications/ipc_radio/overlay-bt_hci_ipc.conf index f08b7f62183b..b3c871080986 100644 --- a/applications/ipc_radio/overlay-bt_hci_ipc.conf +++ b/applications/ipc_radio/overlay-bt_hci_ipc.conf @@ -14,7 +14,6 @@ CONFIG_IPC_SERVICE=y CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_ASSERT=y CONFIG_DEBUG_INFO=y diff --git a/applications/machine_learning/sysbuild/hci_ipc/prj.conf b/applications/machine_learning/sysbuild/hci_ipc/prj.conf index 81dc3686b8c4..eada0f6a8dd4 100644 --- a/applications/machine_learning/sysbuild/hci_ipc/prj.conf +++ b/applications/machine_learning/sysbuild/hci_ipc/prj.conf @@ -16,5 +16,4 @@ CONFIG_BT=y CONFIG_BT_MAX_CONN=10 CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_BUF_CMD_TX_COUNT=10 diff --git a/applications/matter_bridge/sysbuild/hci_ipc/prj.conf b/applications/matter_bridge/sysbuild/hci_ipc/prj.conf index 2a2660495497..c24fb24b7e92 100644 --- a/applications/matter_bridge/sysbuild/hci_ipc/prj.conf +++ b/applications/matter_bridge/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=10 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=y CONFIG_BT_EXT_ADV=y diff --git a/applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf b/applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf index aeef4577fead..42cff60a44fe 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf @@ -21,7 +21,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_LL_SOFTDEVICE=y CONFIG_BT_CTLR_TX_PWR_0=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf index 2a4457f995b3..13c3a6c5a7fc 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf @@ -21,7 +21,6 @@ CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=n CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_LL_SOFTDEVICE=y CONFIG_BT_CTLR_TX_PWR_0=y diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj.conf index 0bf8d7ffc915..bd94dd34fccc 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj.conf @@ -15,7 +15,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj_release.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj_release.conf index d40e0976609d..72bf4e86c3ba 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpurad/images/hci_ipc/prj_release.conf @@ -15,7 +15,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since diff --git a/samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf index 97969e065d34..889ea3ae1969 100644 --- a/samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/central_hr_coded/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf index 0d3d5df261d8..8c6a53d54b72 100644 --- a/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/direction_finding_central/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf index 079e6bb84739..cc9e4e058a04 100644 --- a/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/direction_finding_connectionless_rx/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf index bdbc1803a2fa..2b24e999ea96 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/direction_finding_connectionless_tx/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf index 62e9b27e1169..7dcf99227328 100644 --- a/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/direction_finding_peripheral/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf index 343b5ba78b7d..bf6d81860827 100644 --- a/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf @@ -1,4 +1,3 @@ -CONFIG_IPC_SERVICE=y CONFIG_MBOX=y CONFIG_HEAP_MEM_POOL_SIZE=8192 @@ -8,7 +7,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/fast_pair/locator_tag/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/fast_pair/locator_tag/sysbuild/hci_ipc/prj.conf index e465af60451c..c3af447e6143 100644 --- a/samples/bluetooth/fast_pair/locator_tag/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/fast_pair/locator_tag/sysbuild/hci_ipc/prj.conf @@ -14,7 +14,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since # Host number of completed commands does not follow normal flow control. diff --git a/samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf index 9b56b77a5521..9affc5a256f2 100644 --- a/samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/mesh/light/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf index 9b56b77a5521..9affc5a256f2 100644 --- a/samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/mesh/light_ctrl/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf index 9b56b77a5521..9affc5a256f2 100644 --- a/samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/mesh/light_dimmer/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf index 9b56b77a5521..9affc5a256f2 100644 --- a/samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/mesh/light_switch/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf index 9b56b77a5521..9affc5a256f2 100644 --- a/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/mesh/sensor_server/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf index 9b56b77a5521..9affc5a256f2 100644 --- a/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/mesh/silvair_enocean/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf index 9b51003c9dd3..6bcd3e821b27 100644 --- a/samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/multiple_adv_sets/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf index c9d48c1d8d6e..c96039959fca 100644 --- a/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/nrf_dm/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf index 869a3f7902d7..9ff4cf21166a 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf b/samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf index 6991195c9c32..1453ceedb31c 100644 --- a/samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf +++ b/samples/bluetooth/peripheral_hids_mouse/sysbuild/hci_ipc.conf @@ -14,7 +14,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf index 97969e065d34..889ea3ae1969 100644 --- a/samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/peripheral_hr_coded/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf index 2cae017d85fa..20827cde20e2 100644 --- a/samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/peripheral_mds/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf index 41969de38b26..5f05d04cb671 100644 --- a/samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/peripheral_power_profiling/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf index 465ec3ab55a9..558c8908e24c 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/boards/thingy53_nrf5340_cpunet.conf @@ -16,7 +16,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=10 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_BUF_CMD_TX_COUNT=10 # Increase maximum data length of PDU supported in the Controller diff --git a/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf index 755a1f4ac1e5..39c20b23caba 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_MAX_CONN=16 diff --git a/samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf index a294978089cc..78f7871a1ade 100644 --- a/samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf +++ b/samples/bluetooth/throughput/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf b/samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf index a2b67dd57fd5..8174a03f0db6 100644 --- a/samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf +++ b/samples/matter/light_bulb/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf index ddcc76f1a1f4..dfce0911b817 100644 --- a/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf +++ b/samples/matter/light_bulb/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/light_switch/sysbuild/hci_ipc/prj.conf b/samples/matter/light_switch/sysbuild/hci_ipc/prj.conf index a2b67dd57fd5..8174a03f0db6 100644 --- a/samples/matter/light_switch/sysbuild/hci_ipc/prj.conf +++ b/samples/matter/light_switch/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/matter/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/lock/sysbuild/hci_ipc/prj.conf b/samples/matter/lock/sysbuild/hci_ipc/prj.conf index a2b67dd57fd5..8174a03f0db6 100644 --- a/samples/matter/lock/sysbuild/hci_ipc/prj.conf +++ b/samples/matter/lock/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf index ddcc76f1a1f4..dfce0911b817 100644 --- a/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf +++ b/samples/matter/lock/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/template/sysbuild/hci_ipc/prj.conf b/samples/matter/template/sysbuild/hci_ipc/prj.conf index a2b67dd57fd5..8174a03f0db6 100644 --- a/samples/matter/template/sysbuild/hci_ipc/prj.conf +++ b/samples/matter/template/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf index ddcc76f1a1f4..dfce0911b817 100644 --- a/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf +++ b/samples/matter/template/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf b/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf index a2b67dd57fd5..8174a03f0db6 100644 --- a/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf +++ b/samples/matter/thermostat/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/matter/thermostat/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf b/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf index a2b67dd57fd5..8174a03f0db6 100644 --- a/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf +++ b/samples/matter/window_covering/sysbuild/hci_ipc/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf index 5dbef705fa53..993ccf64d3af 100644 --- a/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf index ddcc76f1a1f4..dfce0911b817 100644 --- a/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf +++ b/samples/matter/window_covering/sysbuild/multiprotocol_rpmsg/prj_release.conf @@ -19,7 +19,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=1 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_PERIPHERAL=y CONFIG_BT_CENTRAL=n CONFIG_BT_BUF_ACL_RX_SIZE=502 diff --git a/samples/nrf5340/multiprotocol_rpmsg/prj.conf b/samples/nrf5340/multiprotocol_rpmsg/prj.conf index ef12069ce6c4..a25c072eb153 100644 --- a/samples/nrf5340/multiprotocol_rpmsg/prj.conf +++ b/samples/nrf5340/multiprotocol_rpmsg/prj.conf @@ -12,7 +12,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since # Host number of completed commands does not follow normal flow control. diff --git a/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf index a7003ff0ef77..54e94c342dfb 100644 --- a/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/openthread/cli/sysbuild/multiprotocol_rpmsg/prj.conf @@ -18,7 +18,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since # Host number of completed commands does not follow normal flow control. diff --git a/samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf index a3558ab51da1..00485336bcda 100644 --- a/samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/openthread/coap_client/sysbuild/multiprotocol_rpmsg/prj.conf @@ -18,7 +18,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since # Host number of completed commands does not follow normal flow control. diff --git a/samples/wifi/ble_coex/sysbuild/hci_ipc/prj.conf b/samples/wifi/ble_coex/sysbuild/hci_ipc/prj.conf index a294978089cc..78f7871a1ade 100644 --- a/samples/wifi/ble_coex/sysbuild/hci_ipc/prj.conf +++ b/samples/wifi/ble_coex/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/wifi/provisioning/ble/sysbuild/hci_ipc/prj.conf b/samples/wifi/provisioning/ble/sysbuild/hci_ipc/prj.conf index 38d69aa9f8bf..a54323a887d9 100644 --- a/samples/wifi/provisioning/ble/sysbuild/hci_ipc/prj.conf +++ b/samples/wifi/provisioning/ble/sysbuild/hci_ipc/prj.conf @@ -8,7 +8,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 CONFIG_BT=y CONFIG_BT_HCI_RAW=y -CONFIG_BT_HCI_RAW_RESERVE=1 #CONFIG_BT_MAX_CONN=16 diff --git a/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf index 772e394e3fa0..aaaaace53744 100644 --- a/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf +++ b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/boards/nrf5340dk_nrf5340_cpunet_fota.conf @@ -17,7 +17,6 @@ CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 CONFIG_BT_CENTRAL=n # Workaround: Unable to allocate command buffer when using K_NO_WAIT since diff --git a/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf index 0ac36bed354d..36cd91082cfb 100644 --- a/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf +++ b/samples/zigbee/light_switch/sysbuild/multiprotocol_rpmsg/prj.conf @@ -12,7 +12,6 @@ CONFIG_BT=y CONFIG_BT_HCI_RAW=y CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y -CONFIG_BT_HCI_RAW_RESERVE=1 # Workaround: Unable to allocate command buffer when using K_NO_WAIT since # Host number of completed commands does not follow normal flow control. From f2e2c537e4d5a42afe5c062fe4abc48eb5abd1e5 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Fri, 17 May 2024 12:07:26 +0200 Subject: [PATCH 05/39] sample: wifi: ble_coex: Ignore zperf periodic results A new calblack event (ZPERF_SESSION_PERIODIC_RESULT) has been added to zperf, just ignore it int the sample for now to prevent build warnings. Signed-off-by: Robert Lubos --- samples/wifi/ble_coex/src/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/samples/wifi/ble_coex/src/main.c b/samples/wifi/ble_coex/src/main.c index f4ed90ec52b4..ec8e77519af4 100644 --- a/samples/wifi/ble_coex/src/main.c +++ b/samples/wifi/ble_coex/src/main.c @@ -280,6 +280,9 @@ static void udp_upload_results_cb(enum zperf_status status, case ZPERF_SESSION_STARTED: LOG_INF("New UDP session started"); break; + case ZPERF_SESSION_PERIODIC_RESULT: + /* Ignored. */ + break; case ZPERF_SESSION_FINISHED: LOG_INF("Wi-Fi benchmark: Upload completed!"); if (result->client_time_in_us != 0U) { From bf2a4f685052ebf984cc7705ea127e0f5240f55b Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Fri, 17 May 2024 12:18:57 +0200 Subject: [PATCH 06/39] net: lwm2m: Align with lwm2m_engine_set_data_cb_t API change lwm2m_engine_set_data_cb_t callback signaure now has an additional offset parameter. Signed-off-by: Robert Lubos --- .../src/cloud/cloud_codec/lwm2m/lwm2m_codec.c | 4 +++- .../src/lwm2m_codec_helpers_test.c | 4 +++- .../src/lwm2m/lwm2m_accelerometer.c | 3 ++- .../lwm2m_client/src/lwm2m/lwm2m_buzzer.c | 6 ++++-- .../src/lwm2m/lwm2m_gas_res_sensor.c | 3 ++- .../src/lwm2m/lwm2m_humid_sensor.c | 3 ++- .../src/lwm2m/lwm2m_light_control.c | 13 +++++++----- .../src/lwm2m/lwm2m_light_sensor.c | 3 ++- .../src/lwm2m/lwm2m_press_sensor.c | 3 ++- .../src/lwm2m/lwm2m_temp_sensor.c | 3 ++- samples/cellular/lwm2m_client/src/main.c | 2 +- .../lwm2m/gnss_assistance_obj.c | 4 ++-- .../lwm2m_client_utils/lwm2m/ground_fix_obj.c | 5 +++-- .../lwm2m/lwm2m_adv_firmware.c | 5 +++-- .../lwm2m/lwm2m_cellconn_obj.c | 14 +++++++------ .../lwm2m_client_utils/lwm2m/lwm2m_firmware.c | 16 +++++++------- .../lwm2m_client_utils/lwm2m/lwm2m_security.c | 4 ++-- .../net/lib/lwm2m_client_utils/src/cellconn.c | 17 ++++++++------- .../src/location_assistance.c | 6 +++--- .../net/lib/lwm2m_client_utils/src/security.c | 6 +++--- .../net/lib/lwm2m_fota_utils/src/firmware.c | 21 ++++++++++--------- 21 files changed, 83 insertions(+), 62 deletions(-) diff --git a/applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec.c b/applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec.c index 1660b34fd2cb..5fecfd8b30d7 100644 --- a/applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec.c +++ b/applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec.c @@ -28,7 +28,8 @@ static cloud_codec_evt_handler_t module_evt_handler; /* Function that is called whenever the configuration object is written to. */ static int config_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { /* Because we are dependent on providing all configurations in the * CLOUD_CODEC_EVT_CONFIG_UPDATE event, all configuration is retrieved whenever the @@ -41,6 +42,7 @@ static int config_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_ ARG_UNUSED(data_len); ARG_UNUSED(last_block); ARG_UNUSED(total_size); + ARG_UNUSED(offset); int err; struct cloud_data_cfg cfg = { 0 }; diff --git a/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c b/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c index 6bd3351719a7..9c82f8612c8b 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c +++ b/applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c @@ -54,7 +54,8 @@ static int date_time_now_stub(int64_t *unix_time_ms, int no_of_calls) * test_codec_helpers_setup_configuration_object_handler. */ static int callback(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { ARG_UNUSED(obj_inst_id); ARG_UNUSED(res_id); @@ -63,6 +64,7 @@ static int callback(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, ARG_UNUSED(data_len); ARG_UNUSED(last_block); ARG_UNUSED(total_size); + ARG_UNUSED(offset); return 0; } diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c index c9dd4bac524a..42bffa22836f 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_accelerometer.c @@ -34,7 +34,8 @@ static time_t timestamp; static int update_timestamp_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { set_ipso_obj_timestamp(IPSO_OBJECT_ACCELEROMETER_ID, obj_inst_id); return 0; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_buzzer.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_buzzer.c index 72b2ee72b437..78b1e1bc9aa2 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_buzzer.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_buzzer.c @@ -22,7 +22,8 @@ LOG_MODULE_DECLARE(app_lwm2m, CONFIG_APP_LOG_LEVEL); static time_t lwm2m_timestamp; static int buzzer_state_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int ret; bool state = *(bool *)data; @@ -43,7 +44,8 @@ static int buzzer_state_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_i } static int buzzer_intensity_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int ret; uint8_t intensity = *(double *)data; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c index 61b10ec69c37..2cbf8f68ee28 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_gas_res_sensor.c @@ -26,7 +26,8 @@ static time_t timestamp; static int update_timestamp_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { set_ipso_obj_timestamp(IPSO_OBJECT_GENERIC_SENSOR_ID, obj_inst_id); return 0; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c index 5c2e346fcf11..618219abcecd 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_humid_sensor.c @@ -25,7 +25,8 @@ static time_t timestamp; static int update_timestamp_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { set_ipso_obj_timestamp(IPSO_OBJECT_HUMIDITY_SENSOR_ID, obj_inst_id); return 0; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_control.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_control.c index e1163b855993..07b99ea50035 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_control.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_control.c @@ -46,7 +46,8 @@ static void reset_on_time(uint16_t obj_inst_id) } static int rgb_lc_on_off_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int ret = 0; bool new_state = *(bool *)data; @@ -93,7 +94,8 @@ static uint8_t calculate_intensity(uint8_t colour_value, uint8_t brightness_valu } static int rgb_lc_colour_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int ret = 0; uint32_t colour_values = strtoul(data, NULL, 0); @@ -125,7 +127,8 @@ static int rgb_lc_colour_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_ } static int rgb_lc_dimmer_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int ret = 0; uint8_t new_brightness = *data; @@ -147,7 +150,7 @@ static int rgb_lc_dimmer_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_ } static int lc_on_off_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { int ret = 0; bool new_state = *(bool *)data; @@ -182,7 +185,7 @@ static int lc_on_off_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst } static int lc_dimmer_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { int ret; uint8_t new_brightness = *data; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c index c48be3b57a80..39067c3ff318 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_light_sensor.c @@ -29,7 +29,8 @@ static time_t timestamp[2]; static int update_timestamp_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { set_ipso_obj_timestamp(IPSO_OBJECT_COLOUR_ID, obj_inst_id); return 0; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c index 002fd9c830db..c357702f9184 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_press_sensor.c @@ -25,7 +25,8 @@ static time_t timestamp; static int update_timestamp_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { set_ipso_obj_timestamp(IPSO_OBJECT_PRESSURE_ID, obj_inst_id); return 0; diff --git a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c index b1a81be58c41..96bdb8e04182 100644 --- a/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c +++ b/samples/cellular/lwm2m_client/src/lwm2m/lwm2m_temp_sensor.c @@ -25,7 +25,8 @@ static time_t timestamp; static int update_timestamp_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { set_ipso_obj_timestamp(IPSO_OBJECT_TEMP_SENSOR_ID, obj_inst_id); return 0; diff --git a/samples/cellular/lwm2m_client/src/main.c b/samples/cellular/lwm2m_client/src/main.c index 81695d98a8bf..fe1c00010187 100644 --- a/samples/cellular/lwm2m_client/src/main.c +++ b/samples/cellular/lwm2m_client/src/main.c @@ -150,7 +150,7 @@ static struct k_work_delayable send_periodical_work; static uint8_t send_count = 0; static int server_send_mute_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { if (*data) { LOG_INF("Server Muted Send"); diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/gnss_assistance_obj.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/gnss_assistance_obj.c index b0501550e9a9..8b25cdd5f8f8 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/gnss_assistance_obj.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/gnss_assistance_obj.c @@ -162,7 +162,7 @@ static int gnss_assist_write_pgps(uint8_t *data, uint16_t data_len, bool last_bl static int gnss_assist_write_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, - bool last_block, size_t total_size) + bool last_block, size_t total_size, size_t offset) { int err = 0; @@ -218,7 +218,7 @@ void gnss_assistance_set_result_code_cb(gnss_assistance_get_result_code_cb_t cb) static int gnss_assistance_result_code_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { int32_t resdata; diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c index 50c1f1bfadbb..46531f7835de 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/ground_fix_obj.c @@ -72,7 +72,7 @@ void ground_fix_set_result_code_cb(ground_fix_get_result_code_cb_t cb) static int ground_fix_result_code_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { if (data_len != sizeof(int32_t)) { return -EINVAL; @@ -93,7 +93,8 @@ static int ground_fix_result_code_cb(uint16_t obj_inst_id, uint16_t res_id, static int forward_to_location_obj(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, - bool last_block, size_t total_size) + bool last_block, size_t total_size, + size_t offset) { struct lwm2m_obj_path path; diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_adv_firmware.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_adv_firmware.c index d5508ddeb02f..e726ca8a1bc9 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_adv_firmware.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_adv_firmware.c @@ -252,7 +252,8 @@ void lwm2m_adv_firmware_set_update_result(uint16_t obj_inst_id, uint8_t result) } static int package_write_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, size_t total_size, + size_t offset) { uint8_t state; int ret = 0; @@ -279,7 +280,7 @@ static int package_write_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_ callback = lwm2m_adv_firmware_get_write_cb(obj_inst_id); if (callback) { ret = callback(obj_inst_id, res_id, res_inst_id, data, data_len, last_block, - total_size); + total_size, offset); } if (ret >= 0) { diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_cellconn_obj.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_cellconn_obj.c index be194d6b9002..2c45f4398c80 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_cellconn_obj.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_cellconn_obj.c @@ -210,7 +210,7 @@ K_TIMER_DEFINE(radio_period_timer, radio_period_timer_fn, NULL); static int disable_radio_period_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { uint16_t period = *(uint16_t *)data; @@ -227,7 +227,8 @@ static int disable_radio_period_cb(uint16_t obj_inst_id, uint16_t res_id, uint16 } static int edrx_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int err; char edrx_param[5] = ""; @@ -361,7 +362,8 @@ static void cache_psm_time_str(int time) } static int active_time_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, - uint8_t *data, uint16_t data_len, bool last_block, size_t total_size) + uint8_t *data, uint16_t data_len, bool last_block, + size_t total_size, size_t offset) { int err; int32_t time = *(int32_t *)data; @@ -384,7 +386,7 @@ static int active_time_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_in } static int psm_time_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { int err; int32_t time = *(int32_t *)data; @@ -425,7 +427,7 @@ static uint8_t get_edrx_kconfig(enum lte_lc_lte_mode lte_mode) #if defined(CONFIG_LWM2M_CELL_CONN_OBJ_VERSION_1_1) static int active_psm_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { int err; @@ -460,7 +462,7 @@ static uint8_t get_rai_kconfig(void) } static int rai_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { int err = 0; diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c index 07d87eedb0c5..36cde213361f 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c @@ -597,7 +597,7 @@ static void *firmware_get_buf(uint16_t obj_inst_id, uint16_t res_id, uint16_t re static int firmware_update_result(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { /* Store state to pernament memory */ write_resource_to_settings(obj_inst_id, res_id, data, data_len); @@ -630,7 +630,7 @@ static void init_firmware_variables(void) static int firmware_update_state(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { int ret; @@ -672,11 +672,11 @@ static void dfu_target_cb(enum dfu_target_evt_id evt) static int firmware_block_received_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, uint16_t data_len, bool last_block, - size_t total_size) + size_t total_size, size_t offset) { uint8_t curent_percent; uint32_t current_bytes; - size_t offset; + size_t target_offset; size_t skip = 0; int ret = 0; int image_type; @@ -720,7 +720,7 @@ static int firmware_block_received_cb(uint16_t obj_inst_id, uint16_t res_id, uin "Application"); } - ret = dfu_target_offset_get(&offset); + ret = dfu_target_offset_get(&target_offset); if (ret < 0) { LOG_ERR("Failed to obtain current offset, err: %d", ret); goto cleanup; @@ -742,8 +742,8 @@ static int firmware_block_received_cb(uint16_t obj_inst_id, uint16_t res_id, uin } } - if (bytes_downloaded < offset) { - skip = MIN(data_len, offset - bytes_downloaded); + if (bytes_downloaded < target_offset) { + skip = MIN(data_len, target_offset - bytes_downloaded); LOG_INF("Skipping bytes %d-%d, already written.", bytes_downloaded, bytes_downloaded + skip); @@ -942,7 +942,7 @@ static void start_pending_fota_download(struct k_work *work) } static int write_dl_uri(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { uint8_t state; char *package_uri = (char *)data; diff --git a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c index 7a16e29e88a8..96cef2882d7f 100644 --- a/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c +++ b/subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_security.c @@ -481,7 +481,7 @@ static void delete_from_storage(uint16_t obj, uint16_t inst, uint16_t res) } static int write_cb_sec(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { if (loading_in_progress) { return 0; @@ -496,7 +496,7 @@ static int write_cb_sec(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst } static int write_cb_srv(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, size_t offset) { if (loading_in_progress) { return 0; diff --git a/tests/subsys/net/lib/lwm2m_client_utils/src/cellconn.c b/tests/subsys/net/lib/lwm2m_client_utils/src/cellconn.c index 6449409bcb59..5fc1e1a90db0 100644 --- a/tests/subsys/net/lib/lwm2m_client_utils/src/cellconn.c +++ b/tests/subsys/net/lib/lwm2m_client_utils/src/cellconn.c @@ -62,7 +62,7 @@ ZTEST(lwm2m_client_utils_cellconn, test_disable_radio_period_cb) setup(); - rc = set_uri_cb(10, 0, 1, (uint8_t *)&period, sizeof(period), true, sizeof(period)); + rc = set_uri_cb(10, 0, 1, (uint8_t *)&period, sizeof(period), true, sizeof(period), 0); zassert_equal(rc, 0, "Wrong return value"); k_sleep(K_SECONDS(70)); /* Wait for timer */ } @@ -74,7 +74,7 @@ ZTEST(lwm2m_client_utils_cellconn, test_psm_time_cb) setup(); - rc = set_uri_cb_psm(10, 0, 4, (uint8_t *)&time, sizeof(time), true, sizeof(time)); + rc = set_uri_cb_psm(10, 0, 4, (uint8_t *)&time, sizeof(time), true, sizeof(time), 0); zassert_equal(rc, 0, "Wrong return value"); } @@ -85,7 +85,8 @@ ZTEST(lwm2m_client_utils_cellconn, test_active_time_cb) setup(); - rc = set_uri_cb_active_time(10, 0, 5, (uint8_t *)&time, sizeof(time), true, sizeof(time)); + rc = set_uri_cb_active_time(10, 0, 5, (uint8_t *)&time, sizeof(time), + true, sizeof(time), 0); zassert_equal(rc, 0, "Wrong return value"); } @@ -96,7 +97,7 @@ ZTEST(lwm2m_client_utils_cellconn, test_edrx_update_cb) setup(); - rc = set_uri_cb_edrx(10, 0, 8, &data, sizeof(data), true, sizeof(data)); + rc = set_uri_cb_edrx(10, 0, 8, &data, sizeof(data), true, sizeof(data), 0); zassert_equal(rc, 0, "Wrong return value"); } @@ -107,7 +108,7 @@ ZTEST(lwm2m_client_utils_cellconn, test_active_psm_update_cb) setup(); - rc = set_uri_cb_psm_update(10, 0, 13, &psm, sizeof(psm), true, sizeof(psm)); + rc = set_uri_cb_psm_update(10, 0, 13, &psm, sizeof(psm), true, sizeof(psm), 0); zassert_equal(rc, 0, "Wrong return value"); } @@ -118,13 +119,13 @@ ZTEST(lwm2m_client_utils_cellconn, test_rai_update_cb) setup(); - rc = set_uri_cb_rai(10, 0, 14, &rai, sizeof(rai), true, sizeof(rai)); + rc = set_uri_cb_rai(10, 0, 14, &rai, sizeof(rai), true, sizeof(rai), 0); zassert_equal(rc, 0, "Wrong return value"); rai = 6; - rc = set_uri_cb_rai(10, 0, 14, &rai, sizeof(rai), true, sizeof(rai)); + rc = set_uri_cb_rai(10, 0, 14, &rai, sizeof(rai), true, sizeof(rai), 0); zassert_equal(rc, -ENOTSUP, "Wrong return value"); rai = 7; - rc = set_uri_cb_rai(10, 0, 14, &rai, sizeof(rai), true, sizeof(rai)); + rc = set_uri_cb_rai(10, 0, 14, &rai, sizeof(rai), true, sizeof(rai), 0); zassert_equal(rc, -EINVAL, "Wrong return value"); } diff --git a/tests/subsys/net/lib/lwm2m_client_utils/src/location_assistance.c b/tests/subsys/net/lib/lwm2m_client_utils/src/location_assistance.c index 1af6086546bf..4ae654d043a1 100644 --- a/tests/subsys/net/lib/lwm2m_client_utils/src/location_assistance.c +++ b/tests/subsys/net/lib/lwm2m_client_utils/src/location_assistance.c @@ -107,7 +107,7 @@ static void gnss_result_set(int32_t result) void *ptr = &result; gnss_obj->resources[GNSS_ASSIST_RESULT_CODE].post_write_cb(0, GNSS_ASSIST_RESULT_CODE, 0, - ptr, 4, true, 4); + ptr, 4, true, 4, 0); } static void ground_result_set(int32_t result) @@ -115,14 +115,14 @@ static void ground_result_set(int32_t result) void *ptr = &result; ground_obj->resources[GROUND_FIX_RESULT_CODE].post_write_cb(0, GROUND_FIX_RESULT_CODE, 0, - ptr, 4, true, 4); + ptr, 4, true, 4, 0); } static void gnss_assist_data_write(uint8_t *buf, int length) { gnss_obj->resources[GNSS_ASSIST_ASSIST_DATA].post_write_cb(0, GNSS_ASSIST_ASSIST_DATA, 0, - buf, length, true, length); + buf, length, true, length, 0); } static void *loaction_assist_suite_setup(void) diff --git a/tests/subsys/net/lib/lwm2m_client_utils/src/security.c b/tests/subsys/net/lib/lwm2m_client_utils/src/security.c index 21a4cf221414..78d52ee3924d 100644 --- a/tests/subsys/net/lib/lwm2m_client_utils/src/security.c +++ b/tests/subsys/net/lib/lwm2m_client_utils/src/security.c @@ -679,7 +679,7 @@ ZTEST(lwm2m_client_utils_security, test_store_to_flash) rc = set_uri_cb(1, 0, 0, CONFIG_LWM2M_CLIENT_UTILS_SERVER, sizeof(CONFIG_LWM2M_CLIENT_UTILS_SERVER), true, - sizeof(CONFIG_LWM2M_CLIENT_UTILS_SERVER)); + sizeof(CONFIG_LWM2M_CLIENT_UTILS_SERVER), 0); zassert_equal(rc, 0, "wrong return value"); zassert_equal(settings_save_one_fake.call_count, 1, "Did not store"); @@ -731,7 +731,7 @@ ZTEST(lwm2m_client_utils_security, test_bs_X509) uint8_t flag = 1; - rc = set_uri_cb(2, 1, 0, &flag, sizeof(flag), true, sizeof(flag)); + rc = set_uri_cb(2, 1, 0, &flag, sizeof(flag), true, sizeof(flag), 0); zassert_equal(rc, 0, "wrong return value"); ctx.sec_obj_inst = 1; @@ -766,7 +766,7 @@ ZTEST(lwm2m_client_utils_security, test_bs_URI) uint8_t flag = 1; - rc = set_uri_cb(2, 1, 0, &flag, sizeof(flag), true, sizeof(flag)); + rc = set_uri_cb(2, 1, 0, &flag, sizeof(flag), true, sizeof(flag), 0); zassert_equal(rc, 0, "wrong return value"); ctx.sec_obj_inst = 1; diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/src/firmware.c b/tests/subsys/net/lib/lwm2m_fota_utils/src/firmware.c index 247dddddbc54..fb093565a1a6 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/src/firmware.c +++ b/tests/subsys/net/lib/lwm2m_fota_utils/src/firmware.c @@ -70,7 +70,8 @@ static struct lwm2m_engine_res *lwm2m_resource_get(uint16_t obj_inst_id, uint16_ } static int post_write_to_resource(uint16_t instance_id, uint16_t resource_id, uint8_t *data, - uint16_t data_len, bool last_block, size_t total_size) + uint16_t data_len, bool last_block, size_t total_size, + size_t offset) { struct lwm2m_engine_res *res; @@ -80,7 +81,7 @@ static int post_write_to_resource(uint16_t instance_id, uint16_t resource_id, ui } return res->post_write_cb(instance_id, res->res_id, 0, data, data_len, last_block, - total_size); + total_size, offset); } static void tear_down_test(void *fixie) @@ -178,7 +179,7 @@ static void test_cancel_and_clear_state(uint16_t instance_id) #else cmp_result = RESULT_DEFAULT; - post_write_to_resource(instance_id, LWM2M_FOTA_PACKAGE_URI_ID, NULL, 0, false, 0); + post_write_to_resource(instance_id, LWM2M_FOTA_PACKAGE_URI_ID, NULL, 0, false, 0, 0); #endif result = get_result(instance_id); printf("Result of cancel %d", result); @@ -558,7 +559,7 @@ ZTEST(lwm2m_client_utils_firmware, test_firmware_pull_failures_cb) /* Test FOTA PUSH return EAGAIN progress report. */ dfu_target_mcuboot_identify_fake.return_val = true; rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, test_dummy_data, 32, false, - 64); + 64, 0); state = get_app_state(); printf("RC %d state %d\r\n", rc, state); zassert_equal(rc, -EAGAIN, "wrong return value"); @@ -709,22 +710,22 @@ ZTEST(lwm2m_client_utils_firmware, test_firmware_push_update) inavalid_cancel = -EINVAL; #endif dfu_target_mcuboot_identify_fake.return_val = false; - rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, NULL, 0, false, 0); + rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, NULL, 0, false, 0, 0); zassert_equal(rc, inavalid_cancel, "wrong return value"); rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, test_dummy_data, 32, false, - 64); + 64, 0); zassert_equal(rc, -ENOMSG, "wrong return value"); dfu_target_mcuboot_identify_fake.return_val = true; rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, test_dummy_data, 32, false, - 64); + 64, 0); state = get_app_state(); zassert_equal(rc, 0, "wrong return value"); zassert_equal(state, STATE_DOWNLOADING, "wrong result value"); target_offset = 32; rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, test_dummy_data, 32, true, - 64); + 64, target_offset); state = get_app_state(); zassert_equal(rc, 0, "wrong return value"); zassert_equal(state, STATE_DOWNLOADED, "wrong result value"); @@ -732,13 +733,13 @@ ZTEST(lwm2m_client_utils_firmware, test_firmware_push_update) test_cancel_and_clear_state(app_instance); rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, test_dummy_data, 32, false, - 0); + 0, 0); state = get_app_state(); zassert_equal(state, STATE_DOWNLOADING, "wrong result value"); zassert_equal(rc, 0, "wrong return value"); target_offset = 32; rc = post_write_to_resource(app_instance, LWM2M_FOTA_PACKAGE_ID, test_dummy_data, 32, true, - 0); + 0, target_offset); state = get_app_state(); zassert_equal(rc, 0, "wrong return value"); zassert_equal(state, STATE_DOWNLOADED, "wrong result value"); From c2066c712f7049942b1265f09849d7ce67ce9e8e Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Fri, 17 May 2024 14:07:26 +0200 Subject: [PATCH 07/39] kernel: Remove NCS boot banner dependency NCS boot banner has to be standalone entity from Zephyr boot banner. Signed-off-by: Robert Lubos --- kernel/Kconfig | 3 ++- subsys/bootloader/Kconfig | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/Kconfig b/kernel/Kconfig index 9427f96250b3..77ed341666f1 100644 --- a/kernel/Kconfig +++ b/kernel/Kconfig @@ -8,8 +8,9 @@ menu "General Kernel Options" menuconfig NCS_BOOT_BANNER bool "NCS boot banner" - depends on BOOT_BANNER default y + select PRINTK + select EARLY_CONSOLE help This option provided an enhanced boot banner output that can include application name and version (if set), NCS version and underlying zephyr version. diff --git a/subsys/bootloader/Kconfig b/subsys/bootloader/Kconfig index 349bd7c7439f..7d32d97c62df 100644 --- a/subsys/bootloader/Kconfig +++ b/subsys/bootloader/Kconfig @@ -209,7 +209,7 @@ if IS_SECURE_BOOTLOADER menuconfig SECURE_BOOT_DEBUG bool "Printing" - select BOOT_BANNER + select NCS_BOOT_BANNER select PRINTK select CONSOLE select SERIAL From 38517da7aad1b2bdc887f926dfe2c3698fa82970 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Fri, 17 May 2024 15:55:35 +0200 Subject: [PATCH 08/39] nrf_security: Fix incompatibility with MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG symbol has been added as an choice option in upstream Zephyr, which is not compatible with how nrf_security interprets the symbol. Try to fix this on the nrf_security side. Signed-off-by: Robert Lubos --- subsys/nrf_security/CMakeLists.txt | 2 ++ subsys/nrf_security/Kconfig.legacy | 4 ---- subsys/nrf_security/Kconfig.psa | 4 ---- subsys/nrf_security/tfm/CMakeLists.txt | 2 ++ 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/subsys/nrf_security/CMakeLists.txt b/subsys/nrf_security/CMakeLists.txt index 3fdbab16c7bd..fa326a70f459 100644 --- a/subsys/nrf_security/CMakeLists.txt +++ b/subsys/nrf_security/CMakeLists.txt @@ -94,6 +94,8 @@ else() endif() endif() +set(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG True) + # Finally adding the crypto lib add_subdirectory(${NRFXLIB_DIR}/crypto crypto_copy) diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy index 1f01a6d5fec0..c9599f943f83 100644 --- a/subsys/nrf_security/Kconfig.legacy +++ b/subsys/nrf_security/Kconfig.legacy @@ -343,10 +343,6 @@ config MBEDTLS_HMAC_DRBG_C This setting will enable HMAC_DRBG APIs in mbed TLS. Corresponds to MBEDTLS_HMAC_DRBG_C setting in mbed TLS config file. -config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG - bool - default y - config MBEDTLS_ENTROPY_C bool prompt "Entropy gathering" diff --git a/subsys/nrf_security/Kconfig.psa b/subsys/nrf_security/Kconfig.psa index 1925f06d857c..264f5fd08f01 100644 --- a/subsys/nrf_security/Kconfig.psa +++ b/subsys/nrf_security/Kconfig.psa @@ -19,10 +19,6 @@ config MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER osource "modules/mbedtls/Kconfig.psa" -config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG - bool - default y - rsource "src/core/Kconfig" rsource "src/ssf_secdom/Kconfig" diff --git a/subsys/nrf_security/tfm/CMakeLists.txt b/subsys/nrf_security/tfm/CMakeLists.txt index 72d6ce7c1b3c..0525af5c9752 100644 --- a/subsys/nrf_security/tfm/CMakeLists.txt +++ b/subsys/nrf_security/tfm/CMakeLists.txt @@ -86,6 +86,8 @@ set(CONFIG_BUILD_WITH_TFM False) # Enable the MBEDTLS_ENABLE_HEAP configuration since TF-M implements heap in crypto_init.c set(CONFIG_MBEDTLS_ENABLE_HEAP True) +set(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG True) + # TF-M build require that PSA Crypto APIs are compiled set(COMPILE_PSA_APIS True) From 2ad82ec1e24fcbe980ff618192b5130d05304ef3 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Fri, 17 May 2024 16:18:55 +0200 Subject: [PATCH 09/39] samples: net: mqtt: Align with SFM_CREATE_STATE API changes From the upstream migration guide: The SMF_CREATE_STATE macro now always takes 5 arguments. The amount of arguments is now independent of the values of CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION. If the additional arguments are not used, they have to be set to NULL Signed-off-by: Robert Lubos --- samples/net/mqtt/src/modules/transport/transport.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/samples/net/mqtt/src/modules/transport/transport.c b/samples/net/mqtt/src/modules/transport/transport.c index abb90976f8a2..b9a1b037766c 100644 --- a/samples/net/mqtt/src/modules/transport/transport.c +++ b/samples/net/mqtt/src/modules/transport/transport.c @@ -299,8 +299,10 @@ static void connected_exit(void *o) /* Construct state table */ static const struct smf_state state[] = { - [MQTT_DISCONNECTED] = SMF_CREATE_STATE(disconnected_entry, disconnected_run, NULL), - [MQTT_CONNECTED] = SMF_CREATE_STATE(connected_entry, connected_run, connected_exit), + [MQTT_DISCONNECTED] = SMF_CREATE_STATE(disconnected_entry, disconnected_run, NULL, + NULL, NULL), + [MQTT_CONNECTED] = SMF_CREATE_STATE(connected_entry, connected_run, connected_exit, + NULL, NULL), }; static void transport_task(void) From 86b881c4f522a9864c75b3865c0ff13c9cee1636 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Fri, 17 May 2024 10:58:53 +0200 Subject: [PATCH 10/39] bluetooth: Remove bt_read_static_addr() "hack" Align code after 484fe3f06c44de897ec0271d8cf36d52300627d7 was added to Zephyr. Jira: NCSDK-27508 Signed-off-by: Marek Pieta --- subsys/bluetooth/controller/hci_driver.c | 25 ------------------------ 1 file changed, 25 deletions(-) diff --git a/subsys/bluetooth/controller/hci_driver.c b/subsys/bluetooth/controller/hci_driver.c index 22c9344c83a0..570f05e53ecf 100644 --- a/subsys/bluetooth/controller/hci_driver.c +++ b/subsys/bluetooth/controller/hci_driver.c @@ -1334,31 +1334,6 @@ static const struct bt_hci_driver drv = { .send = hci_driver_send, }; -#if !defined(CONFIG_BT_HCI_VS_EXT) -uint8_t bt_read_static_addr(struct bt_hci_vs_static_addr addrs[], uint8_t size) -{ - uint8_t retval; - uint8_t return_buffer[sizeof(sdc_hci_cmd_vs_zephyr_read_static_addresses_return_t) - + sizeof(sdc_hci_vs_zephyr_static_address_t)]; - - sdc_hci_cmd_vs_zephyr_read_static_addresses_return_t *return_params = - (sdc_hci_cmd_vs_zephyr_read_static_addresses_return_t *)return_buffer; - - retval = sdc_hci_cmd_vs_zephyr_read_static_addresses( - (sdc_hci_cmd_vs_zephyr_read_static_addresses_return_t *)return_buffer); - __ASSERT(retval == 0, "Expect command to succeed"); - __ASSERT(return_params->num_addresses <= 1, "Avoid buffer overflow"); - - if (return_params->num_addresses == 1 && size >= 1) { - BUILD_ASSERT(sizeof(sdc_hci_vs_zephyr_static_address_t) == - sizeof(struct bt_hci_vs_static_addr)); - memcpy(&addrs[0], return_params->addresses, sizeof(struct bt_hci_vs_static_addr)); - } - - return return_params->num_addresses; -} -#endif /* !defined(CONFIG_BT_HCI_VS_EXT) */ - void bt_ctlr_set_public_addr(const uint8_t *addr) { const sdc_hci_cmd_vs_zephyr_write_bd_addr_t *bd_addr = (void *)addr; From f3ddf95ce9c34072426faf963e7bee2be3a82614 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Fri, 17 May 2024 10:42:34 +0200 Subject: [PATCH 11/39] bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS 18c23daee3317c8b4b9ed69f7d8c81112b5185f8 removes CONFIG_BT_HCI_VS_EXT. Align BLE controller configuration with the changes. Jira: NCSDK-27508 Signed-off-by: Marek Pieta --- samples/bluetooth/peripheral_lbs/prj_minimal.conf | 2 +- samples/bluetooth/peripheral_uart/prj_minimal.conf | 2 +- subsys/bluetooth/controller/hci_internal.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/samples/bluetooth/peripheral_lbs/prj_minimal.conf b/samples/bluetooth/peripheral_lbs/prj_minimal.conf index 747f970bc8fe..eee27f0119fa 100644 --- a/samples/bluetooth/peripheral_lbs/prj_minimal.conf +++ b/samples/bluetooth/peripheral_lbs/prj_minimal.conf @@ -93,7 +93,7 @@ CONFIG_BT_GATT_CACHING=n CONFIG_BT_GATT_SERVICE_CHANGED=n CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=n CONFIG_BT_SETTINGS_CCC_LAZY_LOADING=y -CONFIG_BT_HCI_VS_EXT=n +CONFIG_BT_HCI_VS=n # Disable Bluetooth controller features not needed CONFIG_BT_CTLR_PRIVACY=n diff --git a/samples/bluetooth/peripheral_uart/prj_minimal.conf b/samples/bluetooth/peripheral_uart/prj_minimal.conf index 40e8b2b6071b..24c3c7800765 100644 --- a/samples/bluetooth/peripheral_uart/prj_minimal.conf +++ b/samples/bluetooth/peripheral_uart/prj_minimal.conf @@ -113,7 +113,7 @@ CONFIG_BT_GATT_CACHING=n CONFIG_BT_GATT_SERVICE_CHANGED=n CONFIG_BT_GAP_PERIPHERAL_PREF_PARAMS=n CONFIG_BT_SETTINGS_CCC_LAZY_LOADING=y -CONFIG_BT_HCI_VS_EXT=n +CONFIG_BT_HCI_VS=n # Disable Bluetooth controller features not needed CONFIG_BT_CTLR_PRIVACY=n diff --git a/subsys/bluetooth/controller/hci_internal.c b/subsys/bluetooth/controller/hci_internal.c index 592ca8108b3c..e42371d0f585 100644 --- a/subsys/bluetooth/controller/hci_internal.c +++ b/subsys/bluetooth/controller/hci_internal.c @@ -618,7 +618,6 @@ static void vs_zephyr_supported_commands(sdc_hci_vs_zephyr_supported_commands_t cmds->read_version_info = 1; cmds->read_supported_commands = 1; -#if defined(CONFIG_BT_HCI_VS_EXT) cmds->write_bd_addr = 1; cmds->read_static_addresses = 1; cmds->read_key_hierarchy_roots = 1; @@ -630,7 +629,6 @@ static void vs_zephyr_supported_commands(sdc_hci_vs_zephyr_supported_commands_t cmds->write_tx_power_level = 1; cmds->read_tx_power_level = 1; #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */ -#endif /* CONFIG_BT_HCI_VS_EXT */ } static void vs_supported_commands(sdc_hci_vs_supported_vs_commands_t *cmds) @@ -1550,7 +1548,6 @@ static uint8_t vs_cmd_put(uint8_t const *const cmd, uint8_t *const raw_event_out vs_zephyr_supported_commands((void *)event_out_params); return 0; -#if defined(CONFIG_BT_HCI_VS_EXT) case SDC_HCI_OPCODE_CMD_VS_ZEPHYR_READ_STATIC_ADDRESSES: /* We always return one entry */ *param_length_out += sizeof(sdc_hci_cmd_vs_zephyr_read_static_addresses_return_t); @@ -1579,7 +1576,6 @@ static uint8_t vs_cmd_put(uint8_t const *const cmd, uint8_t *const raw_event_out return sdc_hci_cmd_vs_zephyr_read_tx_power((void *)cmd_params, (void *)event_out_params); #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */ -#endif /* CONFIG_BT_HCI_VS_EXT */ case SDC_HCI_OPCODE_CMD_VS_READ_SUPPORTED_VS_COMMANDS: *param_length_out += sizeof(sdc_hci_cmd_vs_read_supported_vs_commands_return_t); vs_supported_commands((void *)event_out_params); From 6aafb284e539d7507a78b618483ddde14d4d92f9 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Mon, 20 May 2024 14:12:57 +0200 Subject: [PATCH 12/39] lib: fatal_error: Don't enable fatal handler by default globally Enabling custom fatal error handler globally can be problematic for sdk-zephyr samples built in NCS context, as they may define their own handlers, causing linker error. As there's no elegant way to handle that on the sample side, other than noup patches in sdk-zephyr, disable the RESET_ON_FATAL_ERROR config by default. As an alternative for NCS, the config will now be implied by NCS_SAMPLES_DEFAULTS config, which is exclusive for NCS samples only. Additionally, enable CONFIG_REBOOT in a few samples, which rely on reboot functionality but did not enable config explicitly. Signed-off-by: Robert Lubos --- applications/serial_lte_modem/prj.conf | 1 + lib/fatal_error/Kconfig | 1 - samples/Kconfig | 1 + samples/cellular/nrf_provisioning/prj.conf | 1 + samples/crypto/persistent_key_usage/prj.conf | 1 + samples/peripheral/802154_phy_test/prj.conf | 2 ++ samples/wifi/shell/prj.conf | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/applications/serial_lte_modem/prj.conf b/applications/serial_lte_modem/prj.conf index 4e5cb6a364a7..3d1b09640a88 100644 --- a/applications/serial_lte_modem/prj.conf +++ b/applications/serial_lte_modem/prj.conf @@ -9,6 +9,7 @@ CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_STACK_SENTINEL=y CONFIG_PICOLIBC_IO_FLOAT=y CONFIG_RING_BUFFER=y +CONFIG_REBOOT=y # Segger RTT CONFIG_USE_SEGGER_RTT=y diff --git a/lib/fatal_error/Kconfig b/lib/fatal_error/Kconfig index bb79590d3713..6b6ae61315b4 100644 --- a/lib/fatal_error/Kconfig +++ b/lib/fatal_error/Kconfig @@ -6,7 +6,6 @@ menuconfig RESET_ON_FATAL_ERROR bool "Reset on fatal error" - default y if !DEBUG && !BOARD_NATIVE_POSIX && !QEMU_TARGET && !TEST select REBOOT help Enable using the fatal error handler defined for Nordic DKs. diff --git a/samples/Kconfig b/samples/Kconfig index 0a82ff1ecc32..8ebec34b1070 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -13,6 +13,7 @@ config NCS_SAMPLES_DEFAULTS imply ASSERT_NO_COND_INFO imply ASSERT_NO_MSG_INFO imply HW_STACK_PROTECTION if ARCH_HAS_STACK_PROTECTION + imply RESET_ON_FATAL_ERROR if !DEBUG && !BOARD_NATIVE_POSIX && !QEMU_TARGET && !TEST help Use the default configuration for NCS samples. diff --git a/samples/cellular/nrf_provisioning/prj.conf b/samples/cellular/nrf_provisioning/prj.conf index c9dc3f3a5120..852f6349ce0d 100644 --- a/samples/cellular/nrf_provisioning/prj.conf +++ b/samples/cellular/nrf_provisioning/prj.conf @@ -71,6 +71,7 @@ CONFIG_MODEM_ATTEST_TOKEN=y # System CONFIG_HEAP_MEM_POOL_SIZE=16384 CONFIG_MAIN_STACK_SIZE=2048 +CONFIG_REBOOT=y CONFIG_FPU=y # Logging diff --git a/samples/crypto/persistent_key_usage/prj.conf b/samples/crypto/persistent_key_usage/prj.conf index a3fd595bc047..f2a0b759f34e 100644 --- a/samples/crypto/persistent_key_usage/prj.conf +++ b/samples/crypto/persistent_key_usage/prj.conf @@ -8,6 +8,7 @@ CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 CONFIG_MAIN_STACK_SIZE=4096 CONFIG_HEAP_MEM_POOL_SIZE=4096 +CONFIG_REBOOT=y # Enable logging CONFIG_CONSOLE=y diff --git a/samples/peripheral/802154_phy_test/prj.conf b/samples/peripheral/802154_phy_test/prj.conf index 05b6bfae2721..2aa284028222 100644 --- a/samples/peripheral/802154_phy_test/prj.conf +++ b/samples/peripheral/802154_phy_test/prj.conf @@ -1,3 +1,5 @@ +CONFIG_REBOOT=y + # Enabling assert CONFIG_ASSERT=y diff --git a/samples/wifi/shell/prj.conf b/samples/wifi/shell/prj.conf index 6fe5a6254f4f..0f7ae284db44 100644 --- a/samples/wifi/shell/prj.conf +++ b/samples/wifi/shell/prj.conf @@ -67,6 +67,7 @@ CONFIG_WPA_SUPP_LOG_LEVEL_INF=y # Kernel options CONFIG_ENTROPY_GENERATOR=y +CONFIG_REBOOT=y # Logging CONFIG_LOG=y From 956e61f0ae5cda65aecf725ead28e9493c76980b Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Mon, 20 May 2024 15:31:03 +0200 Subject: [PATCH 13/39] applications: nrf_desktop: Disable NCS boot banner nRF Desktop application does not use boot banners provided by Zephyr and NCS. Jira: NCSDK-27508 Signed-off-by: Marek Pieta --- .../nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf | 1 + .../configuration/nrf52810dmouse_nrf52810/prj_release.conf | 1 + .../nrf52820dongle_nrf52820/images/mcuboot/prj.conf | 1 + .../nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf | 1 + .../configuration/nrf52820dongle_nrf52820/prj_release.conf | 1 + .../configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf | 1 + .../nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf | 1 + .../configuration/nrf52833dk_nrf52820/prj_release.conf | 1 + .../configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf | 1 + .../nrf52833dk_nrf52833/images/mcuboot/prj_release.conf | 1 + .../nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf | 1 + .../configuration/nrf52833dk_nrf52833/prj_release.conf | 1 + .../nrf52833dongle_nrf52833/images/mcuboot/prj.conf | 1 + .../nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf | 1 + .../nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf | 1 + .../configuration/nrf52833dongle_nrf52833/prj_release.conf | 1 + .../configuration/nrf52840dk_nrf52840/images/b0/prj.conf | 1 + .../configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf | 1 + .../nrf52840dk_nrf52840/images/b0/prj_keyboard.conf | 1 + .../configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf | 1 + .../configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf | 1 + .../nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf | 1 + .../nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf | 1 + .../nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf | 1 + .../nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf | 1 + .../configuration/nrf52840dk_nrf52840/prj_dongle.conf | 1 + .../configuration/nrf52840dk_nrf52840/prj_fast_pair.conf | 1 + .../configuration/nrf52840dk_nrf52840/prj_keyboard.conf | 1 + .../configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf | 1 + .../configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf | 1 + .../configuration/nrf52840dk_nrf52840/prj_release.conf | 1 + .../nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf | 1 + .../configuration/nrf52840dongle_nrf52840/images/b0/prj.conf | 1 + .../nrf52840dongle_nrf52840/images/b0/prj_3bleconn.conf | 1 + .../nrf52840dongle_nrf52840/images/b0/prj_4llpmconn.conf | 1 + .../nrf52840dongle_nrf52840/images/b0/prj_release.conf | 1 + .../nrf52840dongle_nrf52840/images/b0/prj_release_4llpmconn.conf | 1 + .../nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf | 1 + .../configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf | 1 + .../configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf | 1 + .../configuration/nrf52840dongle_nrf52840/prj_release.conf | 1 + .../nrf52840dongle_nrf52840/prj_release_4llpmconn.conf | 1 + .../configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf | 1 + .../nrf52840gmouse_nrf52840/images/b0/prj_release.conf | 1 + .../nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf | 1 + .../nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf | 1 + .../images/mcuboot/prj_release_fast_pair.conf | 1 + .../nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf | 1 + .../configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf | 1 + .../configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf | 1 + .../configuration/nrf52840gmouse_nrf52840/prj_release.conf | 1 + .../nrf52840gmouse_nrf52840/prj_release_fast_pair.conf | 1 + .../nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf | 1 + .../configuration/nrf52dmouse_nrf52832/prj_release.conf | 1 + .../configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf | 1 + .../nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf | 1 + .../nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf | 1 + .../nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf | 1 + .../configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf | 1 + .../configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf | 1 + .../nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf | 1 + .../nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf | 1 + .../configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf | 1 + .../nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf | 1 + .../nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf | 1 + .../configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf | 1 + .../configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf | 1 + .../nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf | 1 + .../nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf | 1 + .../nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf | 1 + .../configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf | 1 + .../configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf | 1 + .../configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_release.conf | 1 + 73 files changed, 73 insertions(+) diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf index e3a889b2197c..a13c3d9e9f88 100644 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf @@ -62,6 +62,7 @@ CONFIG_MAIN_STACK_SIZE=840 CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf index 8fdc7fe3a557..e844c532236e 100644 --- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf @@ -58,6 +58,7 @@ CONFIG_MAIN_STACK_SIZE=840 CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf index a56f0d447580..c594b275c4dd 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf @@ -56,6 +56,7 @@ CONFIG_UART_LINE_CTRL=n CONFIG_TIMESLICING=n CONFIG_PRINTK=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_ERRNO=n CONFIG_ARM_MPU=n CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf index a867cee25169..87db689a5e74 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf @@ -43,6 +43,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf index c3d21baeec01..eb7fdba946b5 100644 --- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf @@ -41,6 +41,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_NUM_COOP_PRIORITIES=10 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf index 985b38f44c55..742b143b78a9 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf @@ -60,6 +60,7 @@ CONFIG_USE_SEGGER_RTT=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_ERRNO=n CONFIG_ARM_MPU=n CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf index 5437455eca33..d07af21c74cc 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf @@ -44,6 +44,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf index b553b69ed07f..35ee91d14d0c 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf @@ -42,6 +42,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BT_RECV_WORKQ_SYS=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_NUM_COOP_PRIORITIES=10 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 f40d3ad204db..387461d2703b 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf @@ -60,6 +60,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y CONFIG_LOG_BACKEND_SHOW_COLOR=n CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y 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 a631b0ea0996..b5ab3acbd4ef 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 @@ -57,6 +57,7 @@ CONFIG_UART_USE_RUNTIME_CONFIGURE=n CONFIG_UART_LINE_CTRL=n CONFIG_TIMESLICING=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf index 8401d10d163a..b9e62d654c4f 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf @@ -43,6 +43,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf index cad9ec490501..6142e6d84ec5 100644 --- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf @@ -41,6 +41,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 f40d3ad204db..387461d2703b 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf @@ -60,6 +60,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y CONFIG_LOG_BACKEND_SHOW_COLOR=n CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y 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 05c104304aaf..e2ceb956f01f 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 @@ -56,6 +56,7 @@ CONFIG_UART_LINE_CTRL=n CONFIG_TIMESLICING=n CONFIG_PRINTK=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf index 75ae24186f35..766b1e1d6c65 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf @@ -43,6 +43,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf index 79c54c0ef98b..433ad27c4484 100644 --- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf @@ -41,6 +41,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf index ad366480bcb8..c44f7b7d86cb 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf index ad366480bcb8..c44f7b7d86cb 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf index ad366480bcb8..c44f7b7d86cb 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf index 7145ab14ce69..e59075d69ae8 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf index 11321fba9e36..b80d787d71b4 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf index 341958fff5d5..32ce6edba60f 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf @@ -29,6 +29,7 @@ CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_GPIO=n CONFIG_SERIAL=n CONFIG_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf index dcb2ee00337c..77f2094e5272 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf @@ -49,6 +49,7 @@ CONFIG_CONSOLE=y CONFIG_TIMESLICING=n CONFIG_CBPRINTF_NANO=y CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf index 5e143ee16def..0b42f5b04587 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf @@ -33,6 +33,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y CONFIG_LOG_BACKEND_SHOW_COLOR=n CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf index 1267a78d64f3..13a4f94e5bda 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf @@ -61,6 +61,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf index bbe99cca8e75..87dd877fc21c 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf @@ -49,6 +49,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 e693b7e5055d..21f180106e73 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf @@ -83,6 +83,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf index d6bce8e801cd..3108edf79a3f 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf @@ -68,6 +68,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 109fc076caae..c892a416136e 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf @@ -65,6 +65,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 3e16613868cb..cb7c541c6954 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf @@ -69,6 +69,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf index 9b8f067d780f..020d4c4d9497 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf @@ -57,6 +57,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf index 839d7bc70943..8d35ccd6b0a2 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_wwcb.conf @@ -67,6 +67,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 92df3d150279..ba1beef619f7 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/images/b0/prj.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n 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 92df3d150279..ba1beef619f7 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 @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n 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 92df3d150279..ba1beef619f7 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 @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n 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 b01cc41b0fb5..d135a55f8860 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 @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n 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 b01cc41b0fb5..d135a55f8860 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 @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf index db473725db75..ee33989c7cdf 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj.conf @@ -47,6 +47,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf index 4bbfa6037236..2dd87e055ce1 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_3bleconn.conf @@ -58,6 +58,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf index 4c9e1d2126b4..f60e59708006 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_4llpmconn.conf @@ -57,6 +57,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf index 677b8842f242..8c109074fe83 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release.conf @@ -45,6 +45,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 3987b727c2f7..ee0e652ec046 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/prj_release_4llpmconn.conf @@ -55,6 +55,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf index a74ea1c2baef..35702284f578 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf index 6d48da9aed80..f187e472bbd0 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/b0/prj_release.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf index 969caa6c2a60..763e13aaab70 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_fast_pair.conf @@ -29,6 +29,7 @@ CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Disable USB CONFIG_USB_NRFX=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf index 2210cb5a36f7..68875f7d3a5f 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_mcuboot_smp.conf @@ -24,6 +24,7 @@ CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y # Decrease memory footprint CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf index f0ed1590e740..30af6d0e9234 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/images/mcuboot/prj_release_fast_pair.conf @@ -36,6 +36,7 @@ CONFIG_USB_DEVICE_DRIVER=n # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf index bde0cf2599ac..7729f5edd0e1 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj.conf @@ -91,6 +91,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 6054e38aea94..8cb2d20b2a33 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_fast_pair.conf @@ -118,6 +118,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 9270a0a79cbf..6488205f5c9c 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_mcuboot_smp.conf @@ -101,6 +101,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf index 8a4f37a9375c..c627f519cbdb 100644 --- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/prj_release.conf @@ -86,6 +86,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 ea47f85af501..6242855d0ad6 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 @@ -112,6 +112,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf index 91820b414a34..aab35eadbfee 100644 --- a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj.conf @@ -60,6 +60,7 @@ CONFIG_MAIN_STACK_SIZE=840 CONFIG_BT_RX_STACK_SIZE=1460 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf index 4e01a3ae6b32..f47e11e423aa 100644 --- a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/prj_release.conf @@ -55,6 +55,7 @@ CONFIG_MAIN_STACK_SIZE=840 CONFIG_BT_RX_STACK_SIZE=1460 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf index 7145ab14ce69..e59075d69ae8 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/b0/prj_release.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf index be69f05f0731..034915193464 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/images/mcuboot/prj_release_fast_pair.conf @@ -29,6 +29,7 @@ CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n # Use minimal C library instead of the Picolib CONFIG_MINIMAL_LIBC=y diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf index 95a3919183e5..178365d3ea88 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj.conf @@ -66,6 +66,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf index aebcfedd5a0b..32e3574299a0 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release.conf @@ -63,6 +63,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf index 40043c3189f4..3f11b99ea0ca 100644 --- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/prj_release_fast_pair.conf @@ -80,6 +80,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf index 2ff1c8bb9c33..ba078b257d81 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf index 0aec50c72994..5f7a3304102b 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/images/b0/prj_release.conf @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n CONFIG_MAIN_STACK_SIZE=2048 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf index 7fb1d3a30650..d8b540588c03 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj.conf @@ -44,6 +44,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 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 11930543cebc..93ae4c5496ff 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/prj_release.conf @@ -42,6 +42,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf index 42cff60a44fe..dde0a3e955c9 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj.conf @@ -6,6 +6,7 @@ CONFIG_LOG=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_IPC_SERVICE=y CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf index 13c3a6c5a7fc..2fae2eeb6431 100644 --- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpunet/images/hci_ipc/prj_release.conf @@ -6,6 +6,7 @@ CONFIG_LOG=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_IPC_SERVICE=y CONFIG_IPC_SERVICE_BACKEND_RPMSG=y diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf index 090a591d8805..e17a7f182dc0 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj.conf @@ -60,6 +60,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf index 7f90730fc752..72fadd81a00c 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/prj_release.conf @@ -53,6 +53,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf index fe3fdc1383b5..a16d28cdf304 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj.conf @@ -28,6 +28,7 @@ CONFIG_FLASH=y # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_GPIO=n CONFIG_SERIAL=n CONFIG_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf index fe3fdc1383b5..a16d28cdf304 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_keyboard.conf @@ -28,6 +28,7 @@ CONFIG_FLASH=y # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_GPIO=n CONFIG_SERIAL=n CONFIG_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf index fe3fdc1383b5..a16d28cdf304 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/prj_release.conf @@ -28,6 +28,7 @@ CONFIG_FLASH=y # Reduce memory consumption CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_GPIO=n CONFIG_SERIAL=n CONFIG_CONSOLE=n diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf index c5c462f04c9a..b7e9f0baf454 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj.conf @@ -54,6 +54,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf index f9cef0666503..100f99250f3d 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_keyboard.conf @@ -60,6 +60,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_release.conf index 5e9b34a691c3..096e3f1253ce 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_release.conf +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/prj_release.conf @@ -50,6 +50,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y CONFIG_BT_HCI_TX_STACK_SIZE=1536 CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_NUM_COOP_PRIORITIES=10 CONFIG_NUM_PREEMPT_PRIORITIES=11 From d1b0c9fcb7819a9a0f4089a7f2de985a1e63faf3 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Mon, 20 May 2024 17:24:45 +0200 Subject: [PATCH 14/39] modules: memfault: Override MEMFAULT_HTTP_USES_MBEDTLS config default Having mbed TLS enabled in the system does not automatically mean it's used for HTTPS communication in memfault. If offloaded sockets are used, it's not the case regardless of mbed TLS configurations. Override the default value for MEMFAULT_HTTP_USES_MBEDTLS config in case NRF_MODEM_LIB is enabled to n. This config simply enables some extra checks for mbed TLS configuration (whether it fits memfault needs), but since it's not really used for offloaded sockets, it can generate false errors. By default, the config is set to y whenever mbed TLS is enabled, which is oversimplified condition for our case. Signed-off-by: Robert Lubos --- modules/memfault-firmware-sdk/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/memfault-firmware-sdk/Kconfig b/modules/memfault-firmware-sdk/Kconfig index 7056b99bfe43..c30162ac5793 100644 --- a/modules/memfault-firmware-sdk/Kconfig +++ b/modules/memfault-firmware-sdk/Kconfig @@ -6,6 +6,10 @@ if MEMFAULT +config MEMFAULT_HTTP_USES_MBEDTLS + bool + default n if NRF_MODEM_LIB + config MEMFAULT_NCS_PROJECT_KEY string "Memfault API key" help From 50279295de8c2e13e4c50018dc8e7079802f1348 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Tue, 21 May 2024 07:50:41 +0200 Subject: [PATCH 15/39] samples: matter: Renamed rram0 label for nRF54l15pdk Changed rram0 dts label name to the cpuapp_rram for nrf54l15pdk board. Signed-off-by: Kamil Kasperczyk --- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay | 6 +++--- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay | 6 +++--- .../light_switch/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay | 6 +++--- .../template/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay | 6 +++--- .../thermostat/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay | 6 +++--- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay | 6 +++--- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay index 5309c51e086e..b04393e1c6ac 100644 --- a/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay +++ b/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay @@ -7,7 +7,7 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; @@ -24,12 +24,12 @@ }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; diff --git a/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay b/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay index df49bb7b9935..a9a2d4a526db 100644 --- a/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay +++ b/samples/matter/light_bulb/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay @@ -8,7 +8,7 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; @@ -25,12 +25,12 @@ }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; diff --git a/samples/matter/light_switch/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/matter/light_switch/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay index e3f414399bab..f81a37541ae4 100644 --- a/samples/matter/light_switch/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay @@ -7,19 +7,19 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Use watchdog wdt31 as the application watchdog watchdog0 = &wdt31; }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; diff --git a/samples/matter/template/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/matter/template/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay index e3f414399bab..f81a37541ae4 100644 --- a/samples/matter/template/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ b/samples/matter/template/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay @@ -7,19 +7,19 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Use watchdog wdt31 as the application watchdog watchdog0 = &wdt31; }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; diff --git a/samples/matter/thermostat/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/matter/thermostat/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay index e3f414399bab..f81a37541ae4 100644 --- a/samples/matter/thermostat/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay +++ b/samples/matter/thermostat/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay @@ -7,19 +7,19 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Use watchdog wdt31 as the application watchdog watchdog0 = &wdt31; }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; diff --git a/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay index 73624804f30c..9f38f24d86e5 100644 --- a/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay +++ b/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay @@ -7,7 +7,7 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; @@ -28,12 +28,12 @@ }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; diff --git a/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay b/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay index e1a40a9dac4d..74eb0b075b6b 100644 --- a/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay +++ b/samples/matter/window_covering/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay @@ -7,7 +7,7 @@ / { aliases { factory-data = &factory_data; - factory-data-memory-region = &rram0; + factory-data-memory-region = &cpuapp_rram; // Configure PWM module for led1 (LED2 on the board) pwm-led1 = &pwm_led1; @@ -28,12 +28,12 @@ }; }; -/delete-node/ &rram0; +/delete-node/ &cpuapp_rram; &rram_controller { reg = < 0x5004b000 0x17d000 >; - rram0: rram@0 { + cpuapp_rram: rram@0 { compatible = "soc-nv-flash"; erase-block-size = < 0x1000 >; write-block-size = < 0x10 >; From 873403238e5faaa778fc210428fbb8a69d55ba03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Ciupis?= Date: Tue, 21 May 2024 09:15:19 +0200 Subject: [PATCH 16/39] boards: shields: disable NCS_BOOT_BANNER for nRF22xx shields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Boot banner must be disabled for nRF2220 and nRF2240 front-end modules to avoid conflicts between TWIM and UART instances on initialization. Signed-off-by: Jędrzej Ciupis --- boards/shields/nrf2220ek/nrf2220ek.conf | 1 + boards/shields/nrf2240ek/nrf2240ek.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/boards/shields/nrf2220ek/nrf2220ek.conf b/boards/shields/nrf2220ek/nrf2220ek.conf index 761df9d22fc4..fc68e5275b08 100644 --- a/boards/shields/nrf2220ek/nrf2220ek.conf +++ b/boards/shields/nrf2220ek/nrf2220ek.conf @@ -1,2 +1,3 @@ CONFIG_BOOT_BANNER=n CONFIG_EARLY_CONSOLE=n +CONFIG_NCS_BOOT_BANNER=n diff --git a/boards/shields/nrf2240ek/nrf2240ek.conf b/boards/shields/nrf2240ek/nrf2240ek.conf index 761df9d22fc4..fc68e5275b08 100644 --- a/boards/shields/nrf2240ek/nrf2240ek.conf +++ b/boards/shields/nrf2240ek/nrf2240ek.conf @@ -1,2 +1,3 @@ CONFIG_BOOT_BANNER=n CONFIG_EARLY_CONSOLE=n +CONFIG_NCS_BOOT_BANNER=n From c6ebff737369e7926c35be7de9540101294b68f7 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Tue, 21 May 2024 10:38:06 +0200 Subject: [PATCH 17/39] debug: etb_trace: Covert SOC_ON_EXIT_CPU_IDLE handler to C Upstream commit 4760aad353a88c4778ad6bd15720bc8a9a2b4162 changed CPU idle handler from asm to C, so align with that change. Signed-off-by: Robert Lubos --- subsys/debug/etb_trace/include/soc_cpu_idle.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/subsys/debug/etb_trace/include/soc_cpu_idle.h b/subsys/debug/etb_trace/include/soc_cpu_idle.h index 0f6051e3a281..340d6446212b 100644 --- a/subsys/debug/etb_trace/include/soc_cpu_idle.h +++ b/subsys/debug/etb_trace/include/soc_cpu_idle.h @@ -4,9 +4,7 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#if defined(_ASMLANGUAGE) +void etb_trace_on_idle_exit(void); #define SOC_ON_EXIT_CPU_IDLE \ - bl etb_trace_on_idle_exit; - -#endif /* _ASMLANGUAGE */ + etb_trace_on_idle_exit(); From 80db85c215a9212ad2de1be8fc431bec98b23684 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Tue, 21 May 2024 16:15:39 +0530 Subject: [PATCH 18/39] samples: wifi: sta: Fix RAM overflow for nRF52840 Reduce WPA supplicant stack size to accommodate RAM requirements for nRF52840. Signed-off-by: Chaitanya Tata --- samples/wifi/sta/sample.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/samples/wifi/sta/sample.yaml b/samples/wifi/sta/sample.yaml index ab874918b2c8..e6da30aa3fb7 100644 --- a/samples/wifi/sta/sample.yaml +++ b/samples/wifi/sta/sample.yaml @@ -29,6 +29,7 @@ tests: extra_configs: - CONFIG_NET_TX_STACK_SIZE=3700 - CONFIG_NET_RX_STACK_SIZE=3700 + - CONFIG_WPA_SUPP_THREAD_STACK_SIZE=6144 tags: ci_build sysbuild sample.nrf7001_eks.sta: sysbuild: true @@ -41,6 +42,7 @@ tests: extra_configs: - CONFIG_NET_TX_STACK_SIZE=3700 - CONFIG_NET_RX_STACK_SIZE=3700 + - CONFIG_WPA_SUPP_THREAD_STACK_SIZE=6144 tags: ci_build sysbuild sample.nrf7002_eb.thingy53.sta: sysbuild: true From 62b36e8bfbf132cdb4c9a741552c65e2836c5220 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Tue, 21 May 2024 16:18:32 +0530 Subject: [PATCH 19/39] scripts: Quarantine Wi-Fi on nRF54L15 nRF54L15 has low RAM, so, till we optimize Wi-Fi RAM requirements, temporarily quarantine this twister combination. Signed-off-by: Chaitanya Tata --- scripts/quarantine.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index 2dec47ec7072..75dd643dcb25 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -10,3 +10,9 @@ platforms: - nrf7002dk/nrf5340/cpuapp comment: "https://nordicsemi.atlassian.net/browse/KRKNWK-19027" + +- scenarios: + - sample.nrf7002eb.nrf54l15pdk.shell + platforms: + - nrf54l15pdk/nrf54l15/cpuapp + comment: "Till Wi-Fi RAM optimizations are merged" From 44b6c2ace2040598ae6c5585e2c0a319fafdf334 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Tue, 21 May 2024 10:28:52 +0200 Subject: [PATCH 20/39] applications: nrf_desktop: Align RRAM configuration for nRF54L15 PDK Change aligns RRAM configuration for nRF54L15 PDK. The application does not use cpuflpr core, so whole memory can be used by cpuapp. Jira: NCSDK-27508 Signed-off-by: Marek Pieta --- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay | 5 +++++ .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay | 5 +++++ .../nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay index d6504a2b93af..ed41c27b9522 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay @@ -9,6 +9,11 @@ status = "okay"; }; +/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ +&cpuapp_rram { + reg = < 0x0 DT_SIZE_K(1524) >; +}; + / { /* Disable pwmleds and redefine them to align configuration with CAF LEDs requirements. * The configuration needs to match the used board revision (v0.2.1). diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay index 2420ad373c44..0da13b94a8ac 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay @@ -11,6 +11,11 @@ status = "okay"; }; +/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ +&cpuapp_rram { + reg = < 0x0 DT_SIZE_K(1524) >; +}; + / { /* Disable pwmleds and redefine them to align configuration with CAF LEDs requirements. * The configuration needs to match the used board revision (v0.3.0). diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay index 74d3dfbfd22f..f7ae36e73487 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/images/mcuboot/app.overlay @@ -1,3 +1,8 @@ +/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ +&cpuapp_rram { + reg = < 0x0 DT_SIZE_K(1524) >; +}; + / { chosen { zephyr,code-partition = &boot_partition; From c052a60317cc5c011f6b90e1a03446971da93cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Rist=20Sk=C3=B8ien?= Date: Tue, 21 May 2024 16:22:24 +0200 Subject: [PATCH 21/39] Applications: nrf5340_audio: Upmerge fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OCT-3020 Resolved build issues Signed-off-by: Kristoffer Rist Skøien --- .../src/bluetooth/bt_stream/unicast/unicast_client.c | 1 + .../src/bluetooth/bt_stream/unicast/unicast_server.c | 4 +--- .../nrf5340_audio/unicast_client/Kconfig.defaults | 3 +++ .../nrf5340_audio/unicast_server/Kconfig.defaults | 9 +++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c index 4dee9f312700..cc76ef0700cc 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c @@ -1249,6 +1249,7 @@ static void disconnected_cleanup(uint8_t chan_idx) } static void unicast_discovery_complete_cb(struct bt_conn *conn, int err, + const struct bt_csip_set_coordinator_set_member *member, const struct bt_csip_set_coordinator_csis_inst *csis_inst) { if (err) { diff --git a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c index b6e03f7808ca..506b470ad73d 100644 --- a/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c +++ b/applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c @@ -38,8 +38,6 @@ enum csip_set_rank { static le_audio_receive_cb receive_cb; static struct bt_csip_set_member_svc_inst *csip; -/* Left or right channel headset */ -static enum audio_channel channel; /* Advertising data for peer connection */ static uint8_t csip_rsi_adv_data[BT_CSIP_RSI_SIZE]; @@ -349,7 +347,7 @@ static void stream_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_rec bad_frame = true; } - receive_cb(buf->data, buf->len, bad_frame, info->ts, channel, + receive_cb(buf->data, buf->len, bad_frame, info->ts, 0, bt_audio_codec_cfg_get_octets_per_frame(stream->codec_cfg)); } #endif /* (CONFIG_BT_AUDIO_RX) */ diff --git a/applications/nrf5340_audio/unicast_client/Kconfig.defaults b/applications/nrf5340_audio/unicast_client/Kconfig.defaults index bc596e391b99..99f22f3f64e6 100644 --- a/applications/nrf5340_audio/unicast_client/Kconfig.defaults +++ b/applications/nrf5340_audio/unicast_client/Kconfig.defaults @@ -26,6 +26,9 @@ config BT_GATT_DYNAMIC_DB config BT_ISO_MAX_CHAN default 4 +config BT_BAP_UNICAST + default y + config BT_BAP_UNICAST_CLIENT default y diff --git a/applications/nrf5340_audio/unicast_server/Kconfig.defaults b/applications/nrf5340_audio/unicast_server/Kconfig.defaults index 886b6cc1330a..9e86ab29850e 100644 --- a/applications/nrf5340_audio/unicast_server/Kconfig.defaults +++ b/applications/nrf5340_audio/unicast_server/Kconfig.defaults @@ -22,6 +22,12 @@ config BT_GATT_AUTO_SEC_REQ ## ISO related configs ## +config BT_ISO_PERIPHERAL + default y + +config BT_BAP_UNICAST + default y + config BT_BAP_UNICAST_SERVER default y @@ -35,6 +41,9 @@ config BT_DEVICE_APPEARANCE config BT_GAP_PERIPHERAL_PREF_PARAMS default n +config BT_ASCS + default y + config BT_ASCS_ASE_SNK_COUNT default 1 From 8d3647f22024cc697efe687707e82a11fb9ddce1 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Tue, 21 May 2024 17:07:51 +0200 Subject: [PATCH 22/39] scripts: Extend Zephyr tests/samples quarantine See comments along the quarantine entries for reasoning. Signed-off-by: Robert Lubos --- scripts/quarantine_zephyr.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index a0655480a9bf..b54e9170f2ac 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -136,6 +136,18 @@ - nrf9160dk/nrf9160 comment: "https://nordicsemi.atlassian.net/browse/NRFX-3813" +- scenarios: + - sample.sysbuild.hello_world.nrf5340dk_cpuapp_cpunet + platforms: + - nrf5340dk/nrf5340/cpuapp + comment: "Needs https://github.com/nrfconnect/sdk-nrf/pull/13153" + +- scenarios: + - kernel.timer.timer + platforms: + - nrf52dk/nrf52832 + comment: "RAM overflow in NCS specifically - vanilla Zephyr build still fits." + # --------------------------------- Won't fix section ----------------------------------- - scenarios: @@ -193,3 +205,10 @@ - nrf5340dk/nrf5340/cpuapp/ns - nrf9160dk/nrf9160/ns comment: "Won't be fixed - https://nordicsemi.atlassian.net/browse/NCSDK-22771" + +- scenarios: + - sample.net.sockets.http.server + platforms: + - nrf5340dk/nrf5340/cpuapp/ns + - nrf9160dk/nrf9160/ns + comment: "Same reason as in https://nordicsemi.atlassian.net/browse/NCSDK-22771" From 50b0fed90ff2f3b10de3123a35d4b85ee4befafb Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Wed, 22 May 2024 15:00:41 +0530 Subject: [PATCH 23/39] samples: wifi: shell: Increase net management buffers Despite increasing the timeout, sometimes we still see failures in pushing a net management event, so, increase the queue size to fix such scenarios. Fixes SHEL-2773. Signed-off-by: Chaitanya Tata --- samples/wifi/shell/prj.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/wifi/shell/prj.conf b/samples/wifi/shell/prj.conf index 0f7ae284db44..6f025b7f2091 100644 --- a/samples/wifi/shell/prj.conf +++ b/samples/wifi/shell/prj.conf @@ -94,3 +94,4 @@ CONFIG_SETTINGS_NVS=y # environment. CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000 CONFIG_NET_SOCKETS_POLL_MAX=10 +CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=16 From 3fedac2fe541acef37077f7734466f7bacfbd87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20B=C3=B8e?= Date: Wed, 22 May 2024 14:22:50 +0200 Subject: [PATCH 24/39] boards: 54l: ns: Delete the deprecated nrf54l15_cpuapp_ns.dtsi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After some reorganization this file is no longer in use. Signed-off-by: Sebastian Bøe --- dts/arm/nordic/nrf54l15_cpuapp_ns.dtsi | 91 -------------------------- 1 file changed, 91 deletions(-) delete mode 100644 dts/arm/nordic/nrf54l15_cpuapp_ns.dtsi diff --git a/dts/arm/nordic/nrf54l15_cpuapp_ns.dtsi b/dts/arm/nordic/nrf54l15_cpuapp_ns.dtsi deleted file mode 100644 index 4447a5ed48f1..000000000000 --- a/dts/arm/nordic/nrf54l15_cpuapp_ns.dtsi +++ /dev/null @@ -1,91 +0,0 @@ - /* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include -#include -#include - -/ { - cpus { - #address-cells = <1>; - #size-cells = <0>; - - cpu: cpu@0 { - clock-frequency = ; - device_type = "cpu"; - compatible = "arm,cortex-m33f"; - reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - itm: itm@e0000000 { - compatible = "arm,armv8m-itm"; - reg = <0xe0000000 0x1000>; - swo-ref-frequency = ; - }; - }; - }; - - clocks { - lfxo: lfxo { - compatible = "nordic,nrf-lfxo"; - #clock-cells = <0>; - clock-frequency = <32768>; - }; - - hfxo: hfxo { - compatible = "nordic,nrf-hfxo"; - #clock-cells = <0>; - clock-frequency = ; - }; - }; - - soc { - ficr: ficr@ffc000 { - compatible = "nordic,nrf-ficr"; - reg = <0xffc000 0x1000>; - #nordic,ficr-cells = <1>; - }; - - sram0: memory@20000000 { - compatible = "mmio-sram"; - reg = <0x20000000 DT_SIZE_K(256)>; - }; - - peripheral@40000000 { - #address-cells = <1>; - #size-cells = <1>; - ranges = <0x0 0x40000000 0x10000000>; - - /* Common nRF54L15 peripheral description */ - #include "nrf54l15_cpuapp_peripherals_ns.dtsi" - }; - }; -}; - -&nvic { - arm,num-irq-priority-bits = <3>; -}; - -&rram_controller { - rram0: rram@0 { - /* - * "1524 KB non-volatile memory (RRAM) and 256 KB RAM" - * -- Product Specification - * NB: 1524 = 1.5 * 1024 - 12 - */ - reg = <0x0 DT_SIZE_K(1524)>; - }; -}; - -/* Disable by default to use GRTC */ -&systick { - status = "disabled"; -}; - -/* Disable so that TF-M can use this UART */ -&uart30 { - status = "disabled"; -}; From 88b4d534b9dfa412f2d60521ff0ee8f07ef5df17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Rist=20Sk=C3=B8ien?= Date: Wed, 22 May 2024 16:22:00 +0200 Subject: [PATCH 25/39] Applications: nrf5340_audio: Upmerge fixes2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OCT-3020 Resolved BIS+ACL tester upmerge issues Signed-off-by: Kristoffer Rist Skøien --- tests/bluetooth/iso/modules/iso_broadcast_src.c | 13 ++++++++++++- tests/bluetooth/iso/prj.conf | 5 +++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/bluetooth/iso/modules/iso_broadcast_src.c b/tests/bluetooth/iso/modules/iso_broadcast_src.c index 07505fad651d..418cec2c6b63 100644 --- a/tests/bluetooth/iso/modules/iso_broadcast_src.c +++ b/tests/bluetooth/iso/modules/iso_broadcast_src.c @@ -110,6 +110,10 @@ static struct bt_iso_big *big; static uint32_t iso_send_count; static uint8_t iso_data[CONFIG_BT_ISO_TX_MTU] = {0}; +static const struct bt_data ad[] = { + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), +}; + static void broadcaster_t(void *arg1, void *arg2, void *arg3) { static uint8_t initial_send = 2; @@ -227,12 +231,19 @@ int iso_broadcast_src_start(const struct shell *shell, size_t argc, char **argv) } /* Create a non-connectable non-scannable advertising set */ - ret = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, &adv); + ret = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv); if (ret) { LOG_ERR("Failed to create advertising set (ret %d)", ret); return ret; } + /* Set advertising data to have complete local name set */ + ret = bt_le_ext_adv_set_data(adv, ad, ARRAY_SIZE(ad), NULL, 0); + if (ret) { + LOG_ERR("Failed to set advertising data (ret %d)", ret); + return 0; + } + /* Set periodic advertising parameters */ ret = bt_le_per_adv_set_param(adv, BROADCAST_PERIODIC_ADV); if (ret) { diff --git a/tests/bluetooth/iso/prj.conf b/tests/bluetooth/iso/prj.conf index 601d18a9f3a3..18a84e479f24 100644 --- a/tests/bluetooth/iso/prj.conf +++ b/tests/bluetooth/iso/prj.conf @@ -1,16 +1,15 @@ CONFIG_BT=y CONFIG_BT_ISO_BROADCASTER=y -CONFIG_BT_DEBUG_LOG=y CONFIG_BT_DEVICE_NAME="ISO broadcast+ACL central" CONFIG_BT_CENTRAL=y CONFIG_BT_PERIPHERAL=y CONFIG_BT_OBSERVER=y CONFIG_BT_ISO_SYNC_RECEIVER=y +CONFIG_BT_SMP=y CONFIG_BT_ISO_MAX_CHAN=2 CONFIG_BT_ISO_TX_BUF_COUNT=2 CONFIG_BT_ISO_TX_MTU=251 -CONFIG_BT_ISO_LOG_LEVEL_DBG=y CONFIG_BT_EXT_ADV=y CONFIG_BT_PER_ADV_SYNC=y @@ -41,9 +40,11 @@ CONFIG_USE_SEGGER_RTT=y CONFIG_SHELL_RTT_INIT_LOG_LEVEL_NONE=y CONFIG_SHELL_BACKEND_RTT=y CONFIG_SHELL_BACKEND_SERIAL=n +CONFIG_SHELL_VT100_COMMANDS=y CONFIG_SHELL_VT100_COLORS=y CONFIG_SHELL_STACK_SIZE=2048 CONFIG_SHELL_CMD_BUFF_SIZE=128 +CONFIG_SHELL_TAB=y CONFIG_SHELL_TAB_AUTOCOMPLETION=y # Getopt From 48493dbf1d1af41fc06f20c1fe8d9b16d2a2a8b8 Mon Sep 17 00:00:00 2001 From: Maciej Perkowski Date: Wed, 22 May 2024 14:23:57 +0200 Subject: [PATCH 26/39] requirements: Updated pylint version Pylint requires min version 3 to work Signed-off-by: Maciej Perkowski Signed-off-by: Robert Lubos --- scripts/requirements-fixed.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index e518c4ce51f8..235d8cdb550f 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -8,7 +8,7 @@ aenum==3.1.15 # via -r nrf/scripts/requirements-ci.txt anytree==2.9.0 # via -r zephyr/scripts/requirements-base.txt, -r zephyr/scripts/requirements-extras.txt appdirs==1.4.4 # via cmsis-pack-manager arrow==1.2.1 # via gitlint-core -astroid==2.15.6 # via pylint +astroid==3.0.1 # via pylint attrs==23.1.0 # via jsonschema, referencing bitarray==2.8.1 # via -r nrf/scripts/requirements-ci.txt bz==1.0 # via -r zephyr/scripts/requirements-run-test.txt @@ -57,7 +57,6 @@ jsonschema-specifications==2023.7.1 # via jsonschema junit2html==30.1.3 # via -r zephyr/scripts/requirements-extras.txt junitparser==3.1.0 # via -r zephyr/scripts/requirements-compliance.txt lark==1.1.7 # via pyocd -lazy-object-proxy==1.9.0 # via astroid libusb==1.0.27 # via -r nrf/scripts/requirements-extra.txt libusb-package==1.0.26.2 # via pyocd lpc-checksum==2.2.0 # via -r zephyr/scripts/requirements-extras.txt @@ -94,7 +93,7 @@ pygments==2.16.1 # via gcovr pyjwt==2.8.0 # via pygithub pykwalify==1.8.0 # via -r zephyr/scripts/requirements-base.txt, west pylink-square==1.2.0 # via -r zephyr/scripts/requirements-base.txt, pyocd -pylint==2.17.5 # via -r nrf/scripts/requirements-build.txt, -r zephyr/scripts/requirements-compliance.txt +pylint==3.0.2 # via -r nrf/scripts/requirements-build.txt, -r zephyr/scripts/requirements-compliance.txt pynacl==1.5.0 # via pygithub pyocd==0.35.1 # via -r zephyr/scripts/requirements-run-test.txt pyparsing==3.1.1 # via -r nrf/scripts/requirements-ci.txt @@ -132,7 +131,7 @@ urllib3==2.0.7 # via requests wcwidth==0.2.6 # via prettytable west==1.2.0 # via -r nrf/scripts/requirements-base.txt, -r zephyr/scripts/requirements-base.txt wget==3.2 # via -r nrf/scripts/requirements-ci.txt -wrapt==1.15.0 # via astroid, deprecated, python-can +wrapt==1.15.0 # via deprecated, python-can yamllint==1.32.0 # via -r zephyr/scripts/requirements-compliance.txt zcbor==0.8.1 # via -r nrf/scripts/requirements-build.txt, -r nrf/scripts/requirements-extra.txt, -r zephyr/scripts/requirements-extras.txt zipp==3.17.0 # via importlib-metadata, importlib-resources From a55423b623ed636c6dc9005f23c0013c391ac07f Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Thu, 23 May 2024 09:43:17 +0200 Subject: [PATCH 27/39] samples: cellular: fmfu_smp_svr: Enable CRC in the sample Enable CONFIG_CRC, which is a dependency for mcumgr UART transport. Signed-off-by: Robert Lubos --- samples/cellular/fmfu_smp_svr/prj.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/cellular/fmfu_smp_svr/prj.conf b/samples/cellular/fmfu_smp_svr/prj.conf index f3a6cd1a8f9e..203bdcbe7cae 100644 --- a/samples/cellular/fmfu_smp_svr/prj.conf +++ b/samples/cellular/fmfu_smp_svr/prj.conf @@ -32,6 +32,7 @@ CONFIG_MAIN_STACK_SIZE=2048 # Enable the UART mcumgr transports. CONFIG_MCUMGR_TRANSPORT_UART=y CONFIG_BASE64=y +CONFIG_CRC=y CONFIG_UART_MCUMGR_RX_BUF_SIZE=512 CONFIG_MCUMGR_TRANSPORT_NETBUF_SIZE=512 From 8ea9e7771783385b07da784fe6193a069316ec30 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Thu, 23 May 2024 11:30:10 +0200 Subject: [PATCH 28/39] samples: Use default nrf54l15pdk/nrf54l15/cpuapp revision in twister Revision 0.3.0 is now the default revision of nrf54l15pdk/nrf54l15/cpuapp board, hence no longer recognisable by twister if provided explicitly. Update yaml files accordingly to reflect that. Signed-off-by: Robert Lubos --- applications/nrf_desktop/sample.yaml | 8 ++------ samples/benchmarks/coremark/sample.yaml | 2 -- .../central_and_peripheral_hr/sample.yaml | 3 +-- samples/bluetooth/central_hids/sample.yaml | 3 +-- samples/bluetooth/central_uart/sample.yaml | 3 +-- samples/bluetooth/direct_test_mode/sample.yaml | 7 ++----- .../fast_pair/input_device/sample.yaml | 2 -- .../fast_pair/locator_tag/sample.yaml | 2 -- .../peripheral_hids_keyboard/sample.yaml | 4 +--- .../peripheral_hids_mouse/sample.yaml | 4 +--- samples/bluetooth/peripheral_lbs/sample.yaml | 4 +--- samples/bluetooth/peripheral_uart/sample.yaml | 3 +-- samples/esb/esb_prx/sample.yaml | 2 -- samples/esb/esb_ptx/sample.yaml | 2 -- samples/matter/light_bulb/sample.yaml | 18 ++++++------------ samples/matter/light_switch/sample.yaml | 9 +++------ samples/matter/lock/sample.yaml | 10 ++-------- samples/matter/template/sample.yaml | 12 ++++-------- samples/matter/thermostat/sample.yaml | 9 +++------ samples/matter/window_covering/sample.yaml | 9 +++------ samples/nfc/record_launch_app/sample.yaml | 2 -- samples/nfc/record_text/sample.yaml | 2 -- samples/nfc/shell/sample.yaml | 2 -- samples/nfc/system_off/sample.yaml | 2 -- samples/nfc/tnep_tag/sample.yaml | 2 -- samples/nfc/writable_ndef_msg/sample.yaml | 2 -- samples/openthread/cli/sample.yaml | 6 ------ samples/openthread/coprocessor/sample.yaml | 2 -- samples/peripheral/radio_test/sample.yaml | 3 +-- scripts/quarantine_integration.yaml | 1 - 30 files changed, 33 insertions(+), 107 deletions(-) diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index d5a7390d4a14..47e1c1c9d982 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -9,7 +9,7 @@ tests: nrf52dmouse/nrf52832 nrf52kbd/nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 nrf52833dk/nrf52820 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52dmouse/nrf52832 - nrf52kbd/nrf52832 @@ -23,7 +23,6 @@ tests: - nrf52840gmouse/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild applications.nrf_desktop.zdebug_wwcb: sysbuild: true @@ -132,11 +131,9 @@ tests: platform_allow: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=keyboard applications.nrf_desktop.zdebug_nrf21540ek: @@ -167,7 +164,7 @@ tests: nrf52dmouse/nrf52832 nrf52810dmouse/nrf52810 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52dmouse/nrf52832 - nrf52810dmouse/nrf52810 @@ -178,7 +175,6 @@ tests: - nrf52840gmouse/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=release applications.nrf_desktop.zrelease.nrf52kbd: diff --git a/samples/benchmarks/coremark/sample.yaml b/samples/benchmarks/coremark/sample.yaml index 61d5a7f0e834..aa974aba1cfa 100644 --- a/samples/benchmarks/coremark/sample.yaml +++ b/samples/benchmarks/coremark/sample.yaml @@ -13,13 +13,11 @@ tests: - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf52dk/nrf52832 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build harness: console harness_config: diff --git a/samples/bluetooth/central_and_peripheral_hr/sample.yaml b/samples/bluetooth/central_and_peripheral_hr/sample.yaml index 9377ca332928..e97143d5589d 100644 --- a/samples/bluetooth/central_and_peripheral_hr/sample.yaml +++ b/samples/bluetooth/central_and_peripheral_hr/sample.yaml @@ -11,9 +11,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_hids/sample.yaml b/samples/bluetooth/central_hids/sample.yaml index 05563d64057d..0143247464a8 100644 --- a/samples/bluetooth/central_hids/sample.yaml +++ b/samples/bluetooth/central_hids/sample.yaml @@ -19,9 +19,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/central_uart/sample.yaml b/samples/bluetooth/central_uart/sample.yaml index bb27b8ebdd80..899ae204bd89 100644 --- a/samples/bluetooth/central_uart/sample.yaml +++ b/samples/bluetooth/central_uart/sample.yaml @@ -12,10 +12,9 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf21540dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf21540dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/direct_test_mode/sample.yaml b/samples/bluetooth/direct_test_mode/sample.yaml index 8072451f7cc2..961a3722d6c5 100644 --- a/samples/bluetooth/direct_test_mode/sample.yaml +++ b/samples/bluetooth/direct_test_mode/sample.yaml @@ -10,10 +10,9 @@ tests: - nrf21540dk/nrf52840 - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad platform_allow: nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.hci: @@ -25,11 +24,9 @@ tests: - nrf21540dk/nrf52840 - nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad platform_allow: nrf5340dk/nrf5340/cpunet nrf21540dk/nrf52840 nrf52840dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad + nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad tags: bluetooth ci_build sysbuild sample.bluetooth.direct_test_mode.nrf5340_nrf21540: sysbuild: true diff --git a/samples/bluetooth/fast_pair/input_device/sample.yaml b/samples/bluetooth/fast_pair/input_device/sample.yaml index baa623e6da09..a519be706204 100644 --- a/samples/bluetooth/fast_pair/input_device/sample.yaml +++ b/samples/bluetooth/fast_pair/input_device/sample.yaml @@ -11,8 +11,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/fast_pair/locator_tag/sample.yaml b/samples/bluetooth/fast_pair/locator_tag/sample.yaml index 263468d668cc..71f297b81caa 100644 --- a/samples/bluetooth/fast_pair/locator_tag/sample.yaml +++ b/samples/bluetooth/fast_pair/locator_tag/sample.yaml @@ -12,7 +12,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns platform_allow: @@ -22,7 +21,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml index e85a8974b7cb..f51f7155c1d7 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sample.yaml +++ b/samples/bluetooth/peripheral_hids_keyboard/sample.yaml @@ -19,9 +19,7 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild diff --git a/samples/bluetooth/peripheral_hids_mouse/sample.yaml b/samples/bluetooth/peripheral_hids_mouse/sample.yaml index d6731a07ec72..7ffb53f32fb0 100644 --- a/samples/bluetooth/peripheral_hids_mouse/sample.yaml +++ b/samples/bluetooth/peripheral_hids_mouse/sample.yaml @@ -19,11 +19,9 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp + nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_hids_mouse.ble_rpc: sysbuild: true diff --git a/samples/bluetooth/peripheral_lbs/sample.yaml b/samples/bluetooth/peripheral_lbs/sample.yaml index a613745a2ddd..ab8c26e9345c 100644 --- a/samples/bluetooth/peripheral_lbs/sample.yaml +++ b/samples/bluetooth/peripheral_lbs/sample.yaml @@ -13,12 +13,10 @@ tests: - thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp platform_allow: nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp - thingy53/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp + thingy53/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_lbs_minimal: sysbuild: true diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml index c76e89ae3523..ee028106af8d 100644 --- a/samples/bluetooth/peripheral_uart/sample.yaml +++ b/samples/bluetooth/peripheral_uart/sample.yaml @@ -8,7 +8,7 @@ tests: platform_allow: nrf52dk/nrf52832 nrf52833dk/nrf52833 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns thingy53/nrf5340/cpuapp thingy53/nrf5340/cpuapp/ns nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpuapp + nrf54h20dk/nrf54h20/cpuapp integration_platforms: - nrf52dk/nrf52832 - nrf52833dk/nrf52833 @@ -19,7 +19,6 @@ tests: - thingy53/nrf5340/cpuapp/ns - nrf21540dk/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpuapp tags: bluetooth ci_build sysbuild sample.bluetooth.peripheral_uart_cdc: diff --git a/samples/esb/esb_prx/sample.yaml b/samples/esb/esb_prx/sample.yaml index 049e249b8d7b..ac2ef2521e77 100644 --- a/samples/esb/esb_prx/sample.yaml +++ b/samples/esb/esb_prx/sample.yaml @@ -23,7 +23,6 @@ tests: - nrf21540dk/nrf52840 - nrf54h20dk/nrf54h20/cpurad - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52dk/nrf52832 nrf52833dk/nrf52833 @@ -33,7 +32,6 @@ tests: nrf21540dk/nrf52840 nrf54h20dk/nrf54h20/cpurad nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: esb ci_build sysbuild sample.esb.prx.dynamic_irq: sysbuild: true diff --git a/samples/esb/esb_ptx/sample.yaml b/samples/esb/esb_ptx/sample.yaml index b81b82effeb4..ca853a017ab1 100644 --- a/samples/esb/esb_ptx/sample.yaml +++ b/samples/esb/esb_ptx/sample.yaml @@ -23,7 +23,6 @@ tests: - nrf21540dk/nrf52840 - nrf54h20dk/nrf54h20/cpurad - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52dk/nrf52832 nrf52833dk/nrf52833 @@ -33,7 +32,6 @@ tests: nrf21540dk/nrf52840 nrf54h20dk/nrf54h20/cpurad nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: esb ci_build sysbuild sample.esb.ptx.dynamic_irq: sysbuild: true diff --git a/samples/matter/light_bulb/sample.yaml b/samples/matter/light_bulb/sample.yaml index f1604812c421..5a9d3ba0e7f1 100644 --- a/samples/matter/light_bulb/sample.yaml +++ b/samples/matter/light_bulb/sample.yaml @@ -10,9 +10,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.light_bulb.release: sysbuild: true @@ -24,9 +23,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.light_bulb.lto: sysbuild: true @@ -37,9 +35,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.light_bulb.ffs: sysbuild: true @@ -52,9 +49,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.light_bulb.debug.nrf21540ek: sysbuild: true @@ -78,13 +74,12 @@ tests: build_only: true extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: sysbuild sample.matter.light_bulb.aws: sysbuild: true @@ -99,11 +94,10 @@ tests: build_only: true extra_args: CONFIG_CHIP_MEMORY_PROFILING=y CONFIG_SHELL_MINIMAL=y platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: sysbuild diff --git a/samples/matter/light_switch/sample.yaml b/samples/matter/light_switch/sample.yaml index c73591f189d8..a3e44fb02422 100644 --- a/samples/matter/light_switch/sample.yaml +++ b/samples/matter/light_switch/sample.yaml @@ -10,9 +10,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.light_switch.release: sysbuild: true @@ -24,9 +23,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.light_switch.lto: sysbuild: true @@ -46,11 +44,10 @@ tests: build_only: true extra_args: CONFIG_CHIP_PERSISTENT_SUBSCRIPTIONS=y platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp integration_platforms: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: sysbuild diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index b823731d8e51..5fefc011b5e0 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -11,10 +11,8 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp/nrf7001 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: sysbuild sample.matter.lock.release: sysbuild: true @@ -26,10 +24,8 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp/nrf7001 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: sysbuild sample.matter.lock.lto: sysbuild: true @@ -41,9 +37,8 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp/nrf7001 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.lock.smp_dfu: sysbuild: true @@ -55,9 +50,8 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp/nrf7001 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf7002dk/nrf5340/cpuapp/nrf7001 nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.lock.no_dfu.no_fd: sysbuild: true diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index cc983bc1d6b3..7b3c1e24d9f7 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -11,9 +11,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.template.release: sysbuild: true @@ -26,9 +25,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.template.lto: sysbuild: true @@ -40,9 +38,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.template.smp_dfu: sysbuild: true @@ -64,7 +61,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild diff --git a/samples/matter/thermostat/sample.yaml b/samples/matter/thermostat/sample.yaml index 944f0f2fd6ce..98bbe5456b9a 100644 --- a/samples/matter/thermostat/sample.yaml +++ b/samples/matter/thermostat/sample.yaml @@ -10,9 +10,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.thermostat.release: sysbuild: true @@ -24,9 +23,8 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.thermostat.lto: sysbuild: true @@ -37,7 +35,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild diff --git a/samples/matter/window_covering/sample.yaml b/samples/matter/window_covering/sample.yaml index 39995f7abba2..33b9bdfa4f26 100644 --- a/samples/matter/window_covering/sample.yaml +++ b/samples/matter/window_covering/sample.yaml @@ -9,9 +9,8 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.window_cover.release: sysbuild: true @@ -22,9 +21,8 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild sample.matter.window_cover.lto: sysbuild: true @@ -34,7 +32,6 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp + nrf54l15pdk/nrf54l15/cpuapp tags: sysbuild diff --git a/samples/nfc/record_launch_app/sample.yaml b/samples/nfc/record_launch_app/sample.yaml index 08b18062822a..1ffa3f29dbb1 100644 --- a/samples/nfc/record_launch_app/sample.yaml +++ b/samples/nfc/record_launch_app/sample.yaml @@ -12,7 +12,6 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52840dk/nrf52840 nrf52dk/nrf52832 @@ -20,5 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild diff --git a/samples/nfc/record_text/sample.yaml b/samples/nfc/record_text/sample.yaml index 3e6442af1e7e..26fd8ab0f936 100644 --- a/samples/nfc/record_text/sample.yaml +++ b/samples/nfc/record_text/sample.yaml @@ -12,7 +12,6 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52840dk/nrf52840 nrf52dk/nrf52832 @@ -20,5 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild diff --git a/samples/nfc/shell/sample.yaml b/samples/nfc/shell/sample.yaml index 529458af47c8..7135c03c457c 100644 --- a/samples/nfc/shell/sample.yaml +++ b/samples/nfc/shell/sample.yaml @@ -12,7 +12,6 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52840dk/nrf52840 nrf52dk/nrf52832 @@ -20,5 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild diff --git a/samples/nfc/system_off/sample.yaml b/samples/nfc/system_off/sample.yaml index 956ddbec305d..1bb9a979481a 100644 --- a/samples/nfc/system_off/sample.yaml +++ b/samples/nfc/system_off/sample.yaml @@ -11,12 +11,10 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52840dk/nrf52840 nrf52dk/nrf52832 nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild diff --git a/samples/nfc/tnep_tag/sample.yaml b/samples/nfc/tnep_tag/sample.yaml index ac312dc808a3..45ee5fad3bc7 100644 --- a/samples/nfc/tnep_tag/sample.yaml +++ b/samples/nfc/tnep_tag/sample.yaml @@ -12,7 +12,6 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52840dk/nrf52840 nrf52dk/nrf52832 @@ -20,5 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild diff --git a/samples/nfc/writable_ndef_msg/sample.yaml b/samples/nfc/writable_ndef_msg/sample.yaml index 8cfef690b0fd..1d055fe1bbe4 100644 --- a/samples/nfc/writable_ndef_msg/sample.yaml +++ b/samples/nfc/writable_ndef_msg/sample.yaml @@ -12,7 +12,6 @@ tests: - nrf5340dk/nrf5340/cpuapp/ns - nrf54h20dk/nrf54h20/cpuapp - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp platform_allow: > nrf52840dk/nrf52840 nrf52dk/nrf52832 @@ -20,5 +19,4 @@ tests: nrf5340dk/nrf5340/cpuapp/ns nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml index bb7ee1ccf173..0c22b8d16046 100644 --- a/samples/openthread/cli/sample.yaml +++ b/samples/openthread/cli/sample.yaml @@ -14,7 +14,6 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > cli_SNIPPET="ci;logging;multiprotocol;tcp" SB_CONFIG_NETCORE_MULTIPROTOCOL_RPMSG=y @@ -25,7 +24,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp sample.openthread.cli.singleprotocol: sysbuild: true build_only: true @@ -36,7 +34,6 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > cli_SNIPPET="ci;logging;tcp" integration_platforms: @@ -45,7 +42,6 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp sample.openthread.cli.usb: sysbuild: true build_only: true @@ -99,7 +95,6 @@ tests: nrf5340dk/nrf5340/cpuapp nrf5340dk/nrf5340/cpuapp/ns nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > cli_SNIPPET="ci;tcat;tcp" integration_platforms: @@ -108,4 +103,3 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf5340dk/nrf5340/cpuapp/ns - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 65e902bffe75..3f73d3bdb3b8 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -12,7 +12,6 @@ tests: nrf52840dongle/nrf52840 nrf21540dk/nrf52840 nrf54l15pdk/nrf54l15/cpuapp - nrf54l15pdk@0.3.0/nrf54l15/cpuapp extra_args: > SNIPPET="ci;logging;vendor_hook" integration_platforms: @@ -21,7 +20,6 @@ tests: - nrf21540dk/nrf52840 - nrf52840dongle/nrf52840 - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: ci_build sysbuild sample.openthread.coprocessor.usb: sysbuild: true diff --git a/samples/peripheral/radio_test/sample.yaml b/samples/peripheral/radio_test/sample.yaml index 9038ae71a5a2..b45d16669728 100644 --- a/samples/peripheral/radio_test/sample.yaml +++ b/samples/peripheral/radio_test/sample.yaml @@ -11,11 +11,10 @@ tests: - nrf5340dk/nrf5340/cpunet - nrf7002dk/nrf5340/cpunet - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp - nrf54h20dk/nrf54h20/cpurad platform_allow: > nrf52dk/nrf52832 nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpunet nrf7002dk/nrf5340/cpunet - nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad + nrf54l15pdk/nrf54l15/cpuapp nrf54h20dk/nrf54h20/cpurad tags: ci_build sysbuild sample.peripheral.radio_test.nrf5340_nrf21540: sysbuild: true diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml index ad77b3bb9f88..5a278f94daea 100644 --- a/scripts/quarantine_integration.yaml +++ b/scripts/quarantine_integration.yaml @@ -107,7 +107,6 @@ - sample.matter.window_cover.lto platforms: - nrf54l15pdk/nrf54l15/cpuapp - - nrf54l15pdk@0.3.0/nrf54l15/cpuapp comment: "Configurations excluded to limit resources usage in integration builds" - scenarios: From 72d9ef51814857298ca40a005d5ed0b3ed49905a Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Thu, 23 May 2024 12:44:17 +0200 Subject: [PATCH 29/39] applications: nrf_desktop: Change watchdog instance for nrf54l15 The default watchdog instance for nrf54l15 is now wdt31. Signed-off-by: Robert Lubos --- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay | 2 +- .../boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay index ed41c27b9522..3d745a39b879 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_2_1.overlay @@ -5,7 +5,7 @@ */ /* For nRF54L, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */ -&wdt30 { +&wdt31 { status = "okay"; }; diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay index 0da13b94a8ac..bce7e79906f4 100644 --- a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/boards/nrf54l15pdk_nrf54l15_cpuapp_0_3_0.overlay @@ -7,7 +7,7 @@ #include "nrf54l15pdk_nrf54l15_cpuapp_0_3_0_fixup.dtsi" /* For nRF54L, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */ -&wdt30 { +&wdt31 { status = "okay"; }; From 6c477e0d9ce949403528907f04787aadfa164c47 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 23 May 2024 17:18:55 +0530 Subject: [PATCH 30/39] scripts: Qurantine nRF54H Wi-Fi test This needs a revised memory layout for Wi-Fi to easily extend RAM and FLAH, so, on hold for now to unblock upmerge. Fixes SHEL-2777. Signed-off-by: Chaitanya Tata --- scripts/quarantine.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index 75dd643dcb25..314245224fff 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -16,3 +16,9 @@ platforms: - nrf54l15pdk/nrf54l15/cpuapp comment: "Till Wi-Fi RAM optimizations are merged" + +- scenarios: + - sample.nrf54h20dk_nrf7002ek.shell + platforms: + - nrf54h20dk/nrf54h20/cpuapp + comment: "Till nRF54H memory layout is revised" From c30ea284a42986de8bc7dba8851a8309cd9933d9 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Fri, 24 May 2024 09:36:38 +0200 Subject: [PATCH 31/39] lib: net: softap_wifi_provision: Align with SFM API changes From the upstream migration guide: The SMF_CREATE_STATE macro now always takes 5 arguments. The amount of arguments is now independent of the values of CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION. If the additional arguments are not used, they have to be set to NULL Signed-off-by: Robert Lubos --- .../softap_wifi_provision.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 c5c73a3f36d8..571d52b7bf19 100644 --- a/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c +++ b/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c @@ -798,22 +798,24 @@ static void reset_entry(void *o) static const struct smf_state state[] = { [STATE_INIT] = SMF_CREATE_STATE(init_entry, init_run, - NULL), + NULL, NULl, NULl), [STATE_UNPROVISIONED] = SMF_CREATE_STATE(unprovisioned_entry, unprovisioned_run, - unprovisioned_exit), + unprovisioned_exit, + NULl, NULl), [STATE_PROVISIONING] = SMF_CREATE_STATE(provisioning_entry, provisioning_run, - provisioning_exit), + provisioning_exit, + NULl, NULl), [STATE_PROVISIONED] = SMF_CREATE_STATE(NULL, provisioned_run, - provisioned_exit), + provisioned_exit, + NULl, NULl), [STATE_FINISHED] = SMF_CREATE_STATE(finished_entry, finished_run, - NULL), + NULL, NULl, NULl), [STATE_RESET] = SMF_CREATE_STATE(reset_entry, - NULL, - NULL), + NULL, NULL, NULl, NULl), }; static int send_response(struct http_req *request, char *response, size_t len, int socket) From ec5957f397b7d6da79944f6200f130f7527ce0c2 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Fri, 24 May 2024 10:47:00 +0200 Subject: [PATCH 32/39] suit: flash_companion: Adjust minimal configuration Adjust Kconfigs to match the new set of options and dependencies. Ref: NCSDK-NONE Signed-off-by: Tomasz Chyrowicz --- samples/suit/flash_companion/prj.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/samples/suit/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index c55f466a1d00..8d914029f570 100644 --- a/samples/suit/flash_companion/prj.conf +++ b/samples/suit/flash_companion/prj.conf @@ -26,7 +26,7 @@ CONFIG_IRQ_OFFLOAD=n # Disable memory protection CONFIG_THREAD_STACK_INFO=n -CONFIG_THREAD_CUSTOM_DATA=n +CONFIG_BUILTIN_STACK_GUARD=n # Disable unneeded ARM core functionality CONFIG_ARM_MPU=n @@ -34,6 +34,7 @@ CONFIG_FPU=n # Disable boot banner CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_BOOT_DELAY=0 # Disable serial communication From 540f98f20e5b63fb07a4f611e15b7b918e8d9f18 Mon Sep 17 00:00:00 2001 From: Kamil Kasperczyk Date: Fri, 24 May 2024 11:35:00 +0200 Subject: [PATCH 33/39] samples: matter: Disabled NCS boot banner in the sysbuild mcuboot Disabled NCS boot banner for the sysbuild mcuboot config to decrease the flash usage and fit the assumed partition size. Signed-off-by: Kamil Kasperczyk --- applications/matter_bridge/sysbuild/mcuboot/prj.conf | 1 + samples/matter/light_bulb/sysbuild/mcuboot/prj.conf | 1 + samples/matter/light_switch/sysbuild/mcuboot/prj.conf | 1 + samples/matter/lock/sysbuild/mcuboot/prj.conf | 1 + samples/matter/template/sysbuild/mcuboot/prj.conf | 1 + samples/matter/thermostat/sysbuild/mcuboot/prj.conf | 1 + samples/matter/window_covering/sysbuild/mcuboot/prj.conf | 1 + 7 files changed, 7 insertions(+) diff --git a/applications/matter_bridge/sysbuild/mcuboot/prj.conf b/applications/matter_bridge/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/applications/matter_bridge/sysbuild/mcuboot/prj.conf +++ b/applications/matter_bridge/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf b/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf +++ b/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n diff --git a/samples/matter/light_switch/sysbuild/mcuboot/prj.conf b/samples/matter/light_switch/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/prj.conf +++ b/samples/matter/light_switch/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n diff --git a/samples/matter/lock/sysbuild/mcuboot/prj.conf b/samples/matter/lock/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/samples/matter/lock/sysbuild/mcuboot/prj.conf +++ b/samples/matter/lock/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n diff --git a/samples/matter/template/sysbuild/mcuboot/prj.conf b/samples/matter/template/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/samples/matter/template/sysbuild/mcuboot/prj.conf +++ b/samples/matter/template/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n diff --git a/samples/matter/thermostat/sysbuild/mcuboot/prj.conf b/samples/matter/thermostat/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/prj.conf +++ b/samples/matter/thermostat/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n diff --git a/samples/matter/window_covering/sysbuild/mcuboot/prj.conf b/samples/matter/window_covering/sysbuild/mcuboot/prj.conf index 406886b5aab4..a15727a92c24 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/prj.conf +++ b/samples/matter/window_covering/sysbuild/mcuboot/prj.conf @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_LOG=n CONFIG_CONSOLE_HANDLER=n CONFIG_BOOT_BANNER=n +CONFIG_NCS_BOOT_BANNER=n CONFIG_TIMESLICING=n CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_MULTITHREADING=n From a50bde9a736b2b50a7c03c5fdc059e3613524c9e Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Sat, 25 May 2024 10:24:50 +0200 Subject: [PATCH 34/39] samples: Don't use deprecated NET_SOCKETS_POSIX_NAMES Switch to POSIX_API instead. Fix build issues corresponding to this change. Signed-off-by: Robert Lubos --- applications/asset_tracker_v2/boards/native_sim.conf | 2 +- .../asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt | 2 +- samples/cellular/at_client/prj.conf | 2 +- samples/cellular/ciphersuites/prj.conf | 2 +- samples/cellular/gnss/prj.conf | 2 +- samples/cellular/lwm2m_carrier/prj.conf | 2 +- samples/cellular/nrf_cloud_multi_service/overlay_coap.conf | 2 +- .../cellular/nrf_cloud_multi_service/overlay_min_coap.conf | 2 +- .../overlay_nrf7002ek_wifi_coap_no_lte.conf | 2 +- samples/cellular/nrf_cloud_rest_cell_location/prj.conf | 2 +- samples/cellular/nrf_cloud_rest_device_message/prj.conf | 2 +- samples/cellular/nrf_cloud_rest_fota/prj.conf | 2 +- samples/cellular/nrf_provisioning/prj.conf | 2 +- samples/crypto/psa_tls/prj.conf | 2 +- samples/net/aws_iot/boards/native_sim.conf | 2 +- samples/net/aws_iot/src/main.c | 4 ++-- samples/net/azure_iot_hub/boards/native_sim.conf | 2 +- samples/net/coap_client/prj.conf | 2 +- samples/net/download/prj.conf | 2 +- samples/net/mqtt/prj.conf | 2 +- samples/net/udp/boards/native_sim.conf | 2 +- samples/openthread/coap_client/prj.conf | 2 +- samples/openthread/coap_server/prj.conf | 2 +- samples/wifi/monitor/prj.conf | 2 +- samples/wifi/promiscuous/prj.conf | 2 +- samples/wifi/wfa_qt_app/prj.conf | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/applications/asset_tracker_v2/boards/native_sim.conf b/applications/asset_tracker_v2/boards/native_sim.conf index 05e817b38fe1..468ffc505eb7 100644 --- a/applications/asset_tracker_v2/boards/native_sim.conf +++ b/applications/asset_tracker_v2/boards/native_sim.conf @@ -66,7 +66,7 @@ CONFIG_NET_NATIVE=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS_OFFLOAD=n -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt b/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt index 857fc71c8f11..37bfb33a63c8 100644 --- a/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt +++ b/applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt @@ -57,7 +57,7 @@ target_compile_options(app PRIVATE -DCONFIG_LWM2M_ENGINE_VALIDATION_BUFFER_SIZE=128 -DCONFIG_LWM2M_ENGINE_DEFAULT_LIFETIME=60 -DCONFIG_LWM2M_INTEGRATION_MODEM_MODE_REQUEST_RETRY_SECONDS=10 - -DCONFIG_NET_SOCKETS_POSIX_NAMES=1 + -DCONFIG_POSIX_API=y -DCONFIG_LWM2M_CLIENT_UTILS_SECURITY_OBJ_SUPPORT=y -DCONFIG_LWM2M_CLIENT_UTILS_FIRMWARE_UPDATE_OBJ_SUPPORT=y -DCONFIG_CLOUD_CLIENT_ID_USE_CUSTOM=y diff --git a/samples/cellular/at_client/prj.conf b/samples/cellular/at_client/prj.conf index b8051c7df728..36656414bfa0 100644 --- a/samples/cellular/at_client/prj.conf +++ b/samples/cellular/at_client/prj.conf @@ -11,7 +11,7 @@ CONFIG_NETWORKING=y CONFIG_NET_NATIVE=n CONFIG_NET_SOCKETS=y CONFIG_NET_SOCKETS_OFFLOAD=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y # Modem library CONFIG_NRF_MODEM_LIB=y diff --git a/samples/cellular/ciphersuites/prj.conf b/samples/cellular/ciphersuites/prj.conf index c02d6aec937a..a6316f56983c 100644 --- a/samples/cellular/ciphersuites/prj.conf +++ b/samples/cellular/ciphersuites/prj.conf @@ -2,7 +2,7 @@ CONFIG_NRF_MODEM_LIB=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_HEAP_MEM_POOL_SIZE=1024 diff --git a/samples/cellular/gnss/prj.conf b/samples/cellular/gnss/prj.conf index 2337842d3c53..a1d0670cf91d 100644 --- a/samples/cellular/gnss/prj.conf +++ b/samples/cellular/gnss/prj.conf @@ -34,7 +34,7 @@ CONFIG_AT_HOST_LIBRARY=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y # Disable native network stack to save some memory CONFIG_NET_NATIVE=n diff --git a/samples/cellular/lwm2m_carrier/prj.conf b/samples/cellular/lwm2m_carrier/prj.conf index e947d96d833a..82e5c8fcb00d 100644 --- a/samples/cellular/lwm2m_carrier/prj.conf +++ b/samples/cellular/lwm2m_carrier/prj.conf @@ -48,7 +48,7 @@ CONFIG_MAIN_STACK_SIZE=1536 CONFIG_NETWORKING=y CONFIG_NET_NATIVE=n CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_OFFLOAD=y # Allow the non-secure application to request reboot diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf b/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf index 9147a1d7a4c0..dcd39299c707 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_coap.conf @@ -38,7 +38,7 @@ CONFIG_MODEM_INFO_ADD_SIM_ICCID=n CONFIG_MODEM_INFO_ADD_SIM_IMSI=n # Network -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH=y CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY=40 diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf b/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf index 114e6524907d..d8eb7f194b9c 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_min_coap.conf @@ -65,7 +65,7 @@ CONFIG_MODEM_KEY_MGMT=y CONFIG_MODEM_JWT=y # Network -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH=y CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY=40 diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf b/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf index 6c5b7cce7985..19a0c87fd178 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_nrf7002ek_wifi_coap_no_lte.conf @@ -214,7 +214,7 @@ CONFIG_MODEM_INFO_ADD_SIM_ICCID=n CONFIG_MODEM_INFO_ADD_SIM_IMSI=n # Network -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_TLS_SET_MAX_FRAGMENT_LENGTH=y CONFIG_NET_SOCKETS_OFFLOAD_PRIORITY=40 diff --git a/samples/cellular/nrf_cloud_rest_cell_location/prj.conf b/samples/cellular/nrf_cloud_rest_cell_location/prj.conf index a222d1fb33ed..4d9066f189c3 100644 --- a/samples/cellular/nrf_cloud_rest_cell_location/prj.conf +++ b/samples/cellular/nrf_cloud_rest_cell_location/prj.conf @@ -9,7 +9,7 @@ CONFIG_NRF_CLOUD_REST_AUTOGEN_JWT=y CONFIG_MODEM_JWT=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_REST_CLIENT_LOG_LEVEL_ERR=y CONFIG_NRF_CLOUD_CHECK_CREDENTIALS=y diff --git a/samples/cellular/nrf_cloud_rest_device_message/prj.conf b/samples/cellular/nrf_cloud_rest_device_message/prj.conf index f77cd631c687..365131bead65 100644 --- a/samples/cellular/nrf_cloud_rest_device_message/prj.conf +++ b/samples/cellular/nrf_cloud_rest_device_message/prj.conf @@ -11,7 +11,7 @@ CONFIG_NRF_CLOUD_REST=y CONFIG_NRF_CLOUD_CLIENT_ID_SRC_IMEI=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_NRF_CLOUD_CHECK_CREDENTIALS=y diff --git a/samples/cellular/nrf_cloud_rest_fota/prj.conf b/samples/cellular/nrf_cloud_rest_fota/prj.conf index 73ce15ef5268..c0a47f95d996 100644 --- a/samples/cellular/nrf_cloud_rest_fota/prj.conf +++ b/samples/cellular/nrf_cloud_rest_fota/prj.conf @@ -8,7 +8,7 @@ CONFIG_NRF_CLOUD_CLIENT_ID_SRC_IMEI=y CONFIG_MODEM_JWT=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n CONFIG_NRF_CLOUD_CHECK_CREDENTIALS=y diff --git a/samples/cellular/nrf_provisioning/prj.conf b/samples/cellular/nrf_provisioning/prj.conf index 852f6349ce0d..89f90da3914d 100644 --- a/samples/cellular/nrf_provisioning/prj.conf +++ b/samples/cellular/nrf_provisioning/prj.conf @@ -37,7 +37,7 @@ CONFIG_NRF_PROVISIONING_RX_BUF_SZ=2048 # Networking CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=n # MCUBOOT diff --git a/samples/crypto/psa_tls/prj.conf b/samples/crypto/psa_tls/prj.conf index 8459f7ff633c..6721cf772b0c 100644 --- a/samples/crypto/psa_tls/prj.conf +++ b/samples/crypto/psa_tls/prj.conf @@ -26,7 +26,7 @@ CONFIG_NET_TCP_ISN_RFC6528=n CONFIG_NET_CONFIG_SETTINGS=y CONFIG_NET_CONFIG_NEED_IPV6=n CONFIG_NET_CONFIG_NEED_IPV4=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_CONNECTION_MANAGER=n CONFIG_NET_CONTEXT_NET_PKT_POOL=y diff --git a/samples/net/aws_iot/boards/native_sim.conf b/samples/net/aws_iot/boards/native_sim.conf index 78208df3c217..a95d63647d5f 100644 --- a/samples/net/aws_iot/boards/native_sim.conf +++ b/samples/net/aws_iot/boards/native_sim.conf @@ -8,7 +8,7 @@ CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/samples/net/aws_iot/src/main.c b/samples/net/aws_iot/src/main.c index fca6d9c13d3b..4ea49732b060 100644 --- a/samples/net/aws_iot/src/main.c +++ b/samples/net/aws_iot/src/main.c @@ -62,12 +62,12 @@ static int app_topics_subscribe(void) static const struct mqtt_topic topic_list[] = { { .topic.utf8 = MY_CUSTOM_TOPIC_1, - .topic.size = strlen(MY_CUSTOM_TOPIC_1), + .topic.size = sizeof(MY_CUSTOM_TOPIC_1) - 1, .qos = MQTT_QOS_1_AT_LEAST_ONCE, }, { .topic.utf8 = MY_CUSTOM_TOPIC_2, - .topic.size = strlen(MY_CUSTOM_TOPIC_2), + .topic.size = sizeof(MY_CUSTOM_TOPIC_2) - 1, .qos = MQTT_QOS_1_AT_LEAST_ONCE, } }; diff --git a/samples/net/azure_iot_hub/boards/native_sim.conf b/samples/net/azure_iot_hub/boards/native_sim.conf index c56923443d05..523e8a840c58 100644 --- a/samples/net/azure_iot_hub/boards/native_sim.conf +++ b/samples/net/azure_iot_hub/boards/native_sim.conf @@ -11,7 +11,7 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024 CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/samples/net/coap_client/prj.conf b/samples/net/coap_client/prj.conf index 3da8837a5026..e1c4f3e5b9b0 100644 --- a/samples/net/coap_client/prj.conf +++ b/samples/net/coap_client/prj.conf @@ -13,7 +13,7 @@ CONFIG_MAIN_STACK_SIZE=4096 # Networking CONFIG_NETWORKING=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_NATIVE=y CONFIG_NET_UDP=y CONFIG_NET_IPV4=y diff --git a/samples/net/download/prj.conf b/samples/net/download/prj.conf index 19758ba941ef..0801a70152c5 100644 --- a/samples/net/download/prj.conf +++ b/samples/net/download/prj.conf @@ -11,6 +11,6 @@ CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=4096 CONFIG_NETWORKING=y CONFIG_NET_CONNECTION_MANAGER=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_IPV4=y CONFIG_HEAP_MEM_POOL_SIZE=1024 diff --git a/samples/net/mqtt/prj.conf b/samples/net/mqtt/prj.conf index 422e1b18d959..9b29f9f4c1d3 100644 --- a/samples/net/mqtt/prj.conf +++ b/samples/net/mqtt/prj.conf @@ -17,7 +17,7 @@ CONFIG_LOG=y CONFIG_NETWORKING=y CONFIG_NET_SOCKETS_OFFLOAD=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_IPV4=y CONFIG_NET_TCP=y CONFIG_NET_NATIVE=y diff --git a/samples/net/udp/boards/native_sim.conf b/samples/net/udp/boards/native_sim.conf index c6d7f6030cca..3a64c0b71703 100644 --- a/samples/net/udp/boards/native_sim.conf +++ b/samples/net/udp/boards/native_sim.conf @@ -8,7 +8,7 @@ CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_SOCKOPT_TLS=y CONFIG_NET_PKT_RX_COUNT=32 CONFIG_NET_PKT_TX_COUNT=32 diff --git a/samples/openthread/coap_client/prj.conf b/samples/openthread/coap_client/prj.conf index 66b1cdbf07b4..91af70c837e2 100644 --- a/samples/openthread/coap_client/prj.conf +++ b/samples/openthread/coap_client/prj.conf @@ -28,7 +28,7 @@ CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 # Network sockets CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_POLL_MAX=4 # Same network Master Key for client and server diff --git a/samples/openthread/coap_server/prj.conf b/samples/openthread/coap_server/prj.conf index 2abb97e10aab..04c0b360d4c4 100644 --- a/samples/openthread/coap_server/prj.conf +++ b/samples/openthread/coap_server/prj.conf @@ -21,7 +21,7 @@ CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000 # Network sockets CONFIG_NET_SOCKETS=y -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_SOCKETS_POLL_MAX=4 # Same network Master Key for client and server diff --git a/samples/wifi/monitor/prj.conf b/samples/wifi/monitor/prj.conf index 608e38b6926d..1e6270728cd2 100644 --- a/samples/wifi/monitor/prj.conf +++ b/samples/wifi/monitor/prj.conf @@ -52,7 +52,7 @@ CONFIG_POSIX_API=y # environment. CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000 -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_CONTEXT_RCVTIMEO=y CONFIG_NET_MGMT=y CONFIG_NET_MGMT_EVENT=y diff --git a/samples/wifi/promiscuous/prj.conf b/samples/wifi/promiscuous/prj.conf index 6da465c593aa..9091e1f81a9b 100644 --- a/samples/wifi/promiscuous/prj.conf +++ b/samples/wifi/promiscuous/prj.conf @@ -79,5 +79,5 @@ CONFIG_POSIX_CLOCK=y # environment. CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000 -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_NET_CONTEXT_RCVTIMEO=y diff --git a/samples/wifi/wfa_qt_app/prj.conf b/samples/wifi/wfa_qt_app/prj.conf index 268983e5b174..bba6d523ab5d 100644 --- a/samples/wifi/wfa_qt_app/prj.conf +++ b/samples/wifi/wfa_qt_app/prj.conf @@ -98,7 +98,7 @@ CONFIG_SETTINGS_NVS=y # design in net_mgmt. So, use a typical number of networks in a crowded # environment as the queue depth. CONFIG_NET_MGMT_EVENT_QUEUE_SIZE=150 -CONFIG_NET_SOCKETS_POSIX_NAMES=y +CONFIG_POSIX_API=y CONFIG_SHELL_BACKEND_DUMMY=y From 24ddd07cb4a5ab7e601b8c062ca688626b898918 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Fri, 24 May 2024 09:19:12 +0200 Subject: [PATCH 35/39] samples: fast_pair: input_device: Fix build failures on nRF5340 DK Change brings back hci_ipc configuration used for child images to fix build errors on nRF5340 DK. Jira: NCSDK-27508 Signed-off-by: Marek Pieta --- .../input_device/sysbuild/hci_ipc.conf | 8 ++++++ .../input_device/sysbuild/hci_ipc/prj.conf | 25 ------------------- 2 files changed, 8 insertions(+), 25 deletions(-) create mode 100644 samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc.conf delete mode 100644 samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf diff --git a/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc.conf b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc.conf new file mode 100644 index 000000000000..96ef6fc60e6a --- /dev/null +++ b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# The sample reads TX power from controller and includes it into advertising packet +CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y diff --git a/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf b/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf deleted file mode 100644 index bf6d81860827..000000000000 --- a/samples/bluetooth/fast_pair/input_device/sysbuild/hci_ipc/prj.conf +++ /dev/null @@ -1,25 +0,0 @@ -CONFIG_MBOX=y - -CONFIG_HEAP_MEM_POOL_SIZE=8192 - -CONFIG_MAIN_STACK_SIZE=512 -CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=512 - -CONFIG_BT=y -CONFIG_BT_HCI_RAW=y -CONFIG_BT_MAX_CONN=16 - - -# Workaround: Unable to allocate command buffer when using K_NO_WAIT since -# Host number of completed commands does not follow normal flow control. -CONFIG_BT_BUF_CMD_TX_COUNT=10 - -# Enable and adjust the below value as necessary -# CONFIG_BT_BUF_EVT_RX_COUNT=16 -# CONFIG_BT_BUF_EVT_RX_SIZE=255 -# CONFIG_BT_BUF_ACL_RX_SIZE=255 -# CONFIG_BT_BUF_ACL_TX_SIZE=251 -# CONFIG_BT_BUF_CMD_TX_SIZE=255 - -# The sample reads TX power from controller and includes it into advertising packet -CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL=y From a76b81c54e079fc91325773c7387d495830e7279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Grochala?= Date: Mon, 27 May 2024 07:33:11 +0200 Subject: [PATCH 36/39] samples: bluetooth: Remove uses of auto name in advertising MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The adv options to automatically add the name in the advertising and scan response data are deprecated. Update the samples that used those options to explicitly include the name in the advertising and scan response data. Signed-off-by: Michał Grochala Signed-off-by: Robert Lubos --- .../src/main.c | 15 +++++++++++++-- .../direction_finding_peripheral/src/main.c | 3 ++- .../src/combined_bis_cis.c | 13 ++++++++++++- .../bluetooth/iso_time_sync/src/bis_transmitter.c | 13 ++++++++++++- .../bluetooth/iso_time_sync/src/cis_peripheral.c | 6 +++++- samples/bluetooth/mesh/common/smp_bt.c | 3 ++- samples/bluetooth/multiple_adv_sets/src/main.c | 10 ++++++---- samples/bluetooth/peripheral_cgms/src/main.c | 5 +++-- .../peripheral_power_profiling/src/main.c | 8 +++++--- samples/bluetooth/peripheral_rscs/src/main.c | 5 +++-- 10 files changed, 63 insertions(+), 18 deletions(-) diff --git a/samples/bluetooth/direction_finding_connectionless_tx/src/main.c b/samples/bluetooth/direction_finding_connectionless_tx/src/main.c index 1c146555b1c0..61159462872c 100644 --- a/samples/bluetooth/direction_finding_connectionless_tx/src/main.c +++ b/samples/bluetooth/direction_finding_connectionless_tx/src/main.c @@ -20,6 +20,10 @@ /* Number of CTE send in single periodic advertising train */ #define PER_ADV_EVENT_CTE_COUNT 5 +static const struct bt_data ad[] = { + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), +}; + static void adv_sent_cb(struct bt_le_ext_adv *adv, struct bt_le_ext_adv_sent_info *info); @@ -30,8 +34,7 @@ const static struct bt_le_ext_adv_cb adv_callbacks = { static struct bt_le_ext_adv *adv_set; const static struct bt_le_adv_param param = - BT_LE_ADV_PARAM_INIT(BT_LE_ADV_OPT_EXT_ADV | - BT_LE_ADV_OPT_USE_NAME, + BT_LE_ADV_PARAM_INIT(BT_LE_ADV_OPT_EXT_ADV, BT_GAP_ADV_FAST_INT_MIN_2, BT_GAP_ADV_FAST_INT_MAX_2, NULL); @@ -100,6 +103,14 @@ int main(void) } printk("success\n"); + printk("Set advertising data..."); + err = bt_le_ext_adv_set_data(adv_set, ad, ARRAY_SIZE(ad), NULL, 0); + if (err) { + printk("failed (err %d)\n", err); + return 0; + } + printk("success\n"); + printk("Update CTE params..."); err = bt_df_set_adv_cte_tx_param(adv_set, &cte_params); if (err) { diff --git a/samples/bluetooth/direction_finding_peripheral/src/main.c b/samples/bluetooth/direction_finding_peripheral/src/main.c index 15c555f40ce4..3eafde62ca97 100644 --- a/samples/bluetooth/direction_finding_peripheral/src/main.c +++ b/samples/bluetooth/direction_finding_peripheral/src/main.c @@ -20,6 +20,7 @@ static const struct bt_data ad[] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)), BT_DATA_BYTES(BT_DATA_LE_SUPPORTED_FEATURES, BT_LE_SUPP_FEAT_24_ENCODE(DF_FEAT_ENABLED)), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; /* Latency set to zero, to enforce PDU exchange every connection event */ @@ -97,7 +98,7 @@ static void bt_ready(void) printk("Bluetooth initialized\n"); - err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0); + err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0); if (err) { printk("Advertising failed to start (err %d)\n", err); return; diff --git a/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c b/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c index 01dee30c6f0c..55def2701a3c 100644 --- a/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c +++ b/samples/bluetooth/iso_combined_bis_and_cis/src/combined_bis_cis.c @@ -149,6 +149,10 @@ static void set_sdu_data_cb(struct net_buf *buf) } } +static const struct bt_data ad[] = { + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), +}; + void bis_transmitter_start(void) { int err; @@ -156,12 +160,19 @@ void bis_transmitter_start(void) struct bt_iso_big *big; /* Create a non-connectable non-scannable advertising set */ - err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, &adv); + err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv); if (err) { LOG_INF("Failed to create advertising set (err %d)", err); return; } + /* Set the advertising data */ + err = bt_le_ext_adv_set_data(adv, ad, ARRAY_SIZE(ad), NULL, 0); + if (err) { + LOG_INF("failed to set advertising data (err %d)", err); + return; + } + /* Set periodic advertising parameters */ err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_PARAM(PERIODIC_ADV_INTERVAL_BLE_UNITS, PERIODIC_ADV_INTERVAL_BLE_UNITS, diff --git a/samples/bluetooth/iso_time_sync/src/bis_transmitter.c b/samples/bluetooth/iso_time_sync/src/bis_transmitter.c index cbfd5a9fd924..1c3e2a14066a 100644 --- a/samples/bluetooth/iso_time_sync/src/bis_transmitter.c +++ b/samples/bluetooth/iso_time_sync/src/bis_transmitter.c @@ -16,6 +16,10 @@ #include "iso_time_sync.h" +static const struct bt_data ad[] = { + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), +}; + void bis_transmitter_start(uint8_t retransmission_number, uint16_t max_transport_latency_ms) { int err; @@ -25,12 +29,19 @@ void bis_transmitter_start(uint8_t retransmission_number, uint16_t max_transport iso_tx_init(retransmission_number, NULL); /* Create a non-connectable non-scannable advertising set */ - err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN_NAME, NULL, &adv); + err = bt_le_ext_adv_create(BT_LE_EXT_ADV_NCONN, NULL, &adv); if (err) { printk("Failed to create advertising set (err %d)\n", err); return; } + /* Set the advertising data */ + err = bt_le_ext_adv_set_data(adv, ad, ARRAY_SIZE(ad), NULL, 0); + if (err) { + printk("failed to set advertising data (err %d)\n", err); + return; + } + /* Set periodic advertising parameters */ err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_PARAM(BT_GAP_PER_ADV_FAST_INT_MIN_2, BT_GAP_PER_ADV_FAST_INT_MAX_2, diff --git a/samples/bluetooth/iso_time_sync/src/cis_peripheral.c b/samples/bluetooth/iso_time_sync/src/cis_peripheral.c index 4047a7aa395b..e42822d4ff1a 100644 --- a/samples/bluetooth/iso_time_sync/src/cis_peripheral.c +++ b/samples/bluetooth/iso_time_sync/src/cis_peripheral.c @@ -19,6 +19,10 @@ static bool configured_for_tx; +static const struct bt_data ad[] = { + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), +}; + static void connected(struct bt_conn *conn, uint8_t err) { char addr[BT_ADDR_LE_STR_LEN]; @@ -93,7 +97,7 @@ void cis_peripheral_start(bool do_tx) return; } - err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, NULL, 0, NULL, 0); + err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0); if (err) { printk("Advertising failed to start (err %d)\n", err); return; diff --git a/samples/bluetooth/mesh/common/smp_bt.c b/samples/bluetooth/mesh/common/smp_bt.c index 735444f4f96f..6bc34ff5de0e 100644 --- a/samples/bluetooth/mesh/common/smp_bt.c +++ b/samples/bluetooth/mesh/common/smp_bt.c @@ -26,7 +26,7 @@ static struct bt_le_adv_param adv_params = { .id = BT_ID_DEFAULT, .sid = 0, .secondary_max_skip = 0, - .options = BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_USE_NAME, + .options = BT_LE_ADV_OPT_CONNECTABLE, .interval_min = BT_GAP_ADV_SLOW_INT_MIN, .interval_max = BT_GAP_ADV_SLOW_INT_MAX, .peer = NULL @@ -36,6 +36,7 @@ static const struct bt_data ad[] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)), BT_DATA_BYTES(BT_DATA_UUID128_ALL, 0x84, 0xaa, 0x60, 0x74, 0x52, 0x8a, 0x8b, 0x86, 0xd3, 0x4c, 0xb7, 0x1d, 0x1d, 0xdc, 0x53, 0x8d), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; static void pending_adv_start(struct k_work *work) diff --git a/samples/bluetooth/multiple_adv_sets/src/main.c b/samples/bluetooth/multiple_adv_sets/src/main.c index df4ab3dd4225..928059f17002 100644 --- a/samples/bluetooth/multiple_adv_sets/src/main.c +++ b/samples/bluetooth/multiple_adv_sets/src/main.c @@ -30,13 +30,13 @@ static K_WORK_DEFINE(advertising_work, advertising_work_handle); static struct bt_le_ext_adv *ext_adv[CONFIG_BT_EXT_ADV_MAX_ADV_SET]; static const struct bt_le_adv_param *non_connectable_adv_param = - BT_LE_ADV_PARAM(BT_LE_ADV_OPT_USE_NAME, + BT_LE_ADV_PARAM(BT_LE_ADV_OPT_NONE, 0x140, /* 200 ms */ 0x190, /* 250 ms */ NULL); static const struct bt_le_adv_param *connectable_adv_param = - BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_USE_NAME, + BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE, BT_GAP_ADV_FAST_INT_MIN_2, /* 100 ms */ BT_GAP_ADV_FAST_INT_MAX_2, /* 150 ms */ NULL); @@ -47,12 +47,14 @@ static const struct bt_data non_connectable_data[] = { 0x17, /* UTF-8 code point for “https:” */ '/', '/', 'w', 'w', 'w', '.', 'n', 'o', 'r', 'd', 'i', 'c', 's', 'e', 'm', 'i', '.', - 'c', 'o', 'm') + 'c', 'o', 'm'), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; static const struct bt_data connectable_data[] = { BT_DATA_BYTES(BT_DATA_FLAGS, BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR), - BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_DIS_VAL)) + BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_DIS_VAL)), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; static void adv_connected_cb(struct bt_le_ext_adv *adv, diff --git a/samples/bluetooth/peripheral_cgms/src/main.c b/samples/bluetooth/peripheral_cgms/src/main.c index 227fbe682ae8..9ded7961bb37 100644 --- a/samples/bluetooth/peripheral_cgms/src/main.c +++ b/samples/bluetooth/peripheral_cgms/src/main.c @@ -31,7 +31,8 @@ static const struct bt_data ad[] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)), BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_CGMS_VAL), - BT_UUID_16_ENCODE(BT_UUID_DIS_VAL)) + BT_UUID_16_ENCODE(BT_UUID_DIS_VAL)), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; static void connected(struct bt_conn *conn, uint8_t err) @@ -148,7 +149,7 @@ int main(void) return 0; } - err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0); + err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0); if (err) { printk("Advertising failed to start (err %d)\n", err); return 0; diff --git a/samples/bluetooth/peripheral_power_profiling/src/main.c b/samples/bluetooth/peripheral_power_profiling/src/main.c index 88a542e01f44..1e6a17c798fe 100644 --- a/samples/bluetooth/peripheral_power_profiling/src/main.c +++ b/samples/bluetooth/peripheral_power_profiling/src/main.c @@ -79,6 +79,7 @@ static struct bt_conn *device_conn; static const struct bt_data connectable_ad_data[] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; static const struct bt_data non_connectable_ad_data[] = { @@ -87,17 +88,18 @@ static const struct bt_data non_connectable_ad_data[] = { 0x17, /* UTF-8 code point for “https:” */ '/', '/', 'w', 'w', 'w', '.', 'n', 'o', 'r', 'd', 'i', 'c', 's', 'e', 'm', 'i', '.', - 'c', 'o', 'm') + 'c', 'o', 'm'), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1), }; static const struct bt_le_adv_param *connectable_ad_params = - BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_USE_NAME, + BT_LE_ADV_PARAM(BT_LE_ADV_OPT_CONNECTABLE, CONNECTABLE_ADV_INTERVAL_MIN, CONNECTABLE_ADV_INTERVAL_MAX, NULL); static const struct bt_le_adv_param *non_connectable_ad_params = - BT_LE_ADV_PARAM(BT_LE_ADV_OPT_USE_NAME, + BT_LE_ADV_PARAM(BT_LE_ADV_OPT_NONE, NON_CONNECTABLE_ADV_INTERVAL_MIN, NON_CONNECTABLE_ADV_INTERVAL_MAX, NULL); diff --git a/samples/bluetooth/peripheral_rscs/src/main.c b/samples/bluetooth/peripheral_rscs/src/main.c index a993648e7d16..82c1122ab3c3 100644 --- a/samples/bluetooth/peripheral_rscs/src/main.c +++ b/samples/bluetooth/peripheral_rscs/src/main.c @@ -219,7 +219,8 @@ static struct bt_conn_auth_info_cb conn_auth_info_callbacks; static const struct bt_data ad[] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)), - BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_RSCS_VAL)) + BT_DATA_BYTES(BT_DATA_UUID16_ALL, BT_UUID_16_ENCODE(BT_UUID_RSCS_VAL)), + BT_DATA(BT_DATA_NAME_COMPLETE, CONFIG_BT_DEVICE_NAME, sizeof(CONFIG_BT_DEVICE_NAME) - 1) }; int main(void) @@ -285,7 +286,7 @@ int main(void) return 0; } - err = bt_le_adv_start(BT_LE_ADV_CONN_NAME, ad, ARRAY_SIZE(ad), NULL, 0); + err = bt_le_adv_start(BT_LE_ADV_CONN, ad, ARRAY_SIZE(ad), NULL, 0); if (err) { printk("Advertising failed to start (err %d)\n", err); return 0; From 38309fe567f880215483c49ba71ba2bac020773d Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Mon, 27 May 2024 16:36:31 +0200 Subject: [PATCH 37/39] doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge Update upstream Zephyr SHA to ea02b93eea35afef32ebb31f49f8e79932e7deee. Signed-off-by: Robert Lubos --- .../releases/release-notes-changelog.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 82e6df38f82d..d0634476e17d 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -950,21 +950,21 @@ Zephyr .. NOTE TO MAINTAINERS: All the Zephyr commits in the below git commands must be handled specially after each upmerge and each nRF Connect SDK release. -The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``0051731a41fa2c9057f360dc9b819e47b2484be5``, with some |NCS| specific additions. +The Zephyr fork in |NCS| (``sdk-zephyr``) contains all commits from the upstream Zephyr repository up to and including ``ea02b93eea35afef32ebb31f49f8e79932e7deee``, with some |NCS| specific additions. For the list of upstream Zephyr commits (not including cherry-picked commits) incorporated into nRF Connect SDK since the most recent release, run the following command from the :file:`ncs/zephyr` repository (after running ``west update``): .. code-block:: none - git log --oneline 0051731a41 ^23cf38934c + git log --oneline ea02b93eea ^23cf38934c For the list of |NCS| specific commits, including commits cherry-picked from upstream, run: .. code-block:: none - git log --oneline manifest-rev ^0051731a41 + git log --oneline manifest-rev ^ea02b93eea -The current |NCS| main branch is based on revision ``0051731a41`` of Zephyr. +The current |NCS| main branch is based on revision ``ea02b93eea`` of Zephyr. .. note:: For possible breaking changes and changes between the latest Zephyr release and the current Zephyr version, refer to the :ref:`Zephyr release notes `. From cf31f507c78bc41f71d4c0f6b7eb8022dc8d448a Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Mon, 27 May 2024 17:53:51 +0200 Subject: [PATCH 38/39] scripts: Quarantine iso_time_sync on nrf54l15pdk GPIOTE cannot be used with LED0 on nrf54l15pdk/nrf54l15/cpuapp in version 0.3.0. Signed-off-by: Robert Lubos --- scripts/quarantine.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index 314245224fff..7b65be7d434e 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -22,3 +22,9 @@ platforms: - nrf54h20dk/nrf54h20/cpuapp comment: "Till nRF54H memory layout is revised" + +- scenarios: + - sample.bluetooth.iso_time_sync + platforms: + - nrf54l15pdk/nrf54l15/cpuapp + comment: "https://nordicsemi.atlassian.net/browse/DRGN-22129" From 0d202c30a186c16358220327d1401cce8e8fd802 Mon Sep 17 00:00:00 2001 From: Robert Lubos Date: Tue, 28 May 2024 17:08:48 +0200 Subject: [PATCH 39/39] samples: bluetooth: connection_event_trigger: Increase BT_RX_STACK_SIZE The stack size needs to be increased after the upmerge, as the sample reports stack overflow when printing logs. Signed-off-by: Robert Lubos --- samples/bluetooth/connection_event_trigger/prj.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/bluetooth/connection_event_trigger/prj.conf b/samples/bluetooth/connection_event_trigger/prj.conf index 511f27157d77..e6d0cc1e974b 100644 --- a/samples/bluetooth/connection_event_trigger/prj.conf +++ b/samples/bluetooth/connection_event_trigger/prj.conf @@ -32,5 +32,6 @@ CONFIG_BT_SCAN_UUID_CNT=1 CONFIG_BT_CTLR_SDC_EVENT_TRIGGER=y CONFIG_HEAP_MEM_POOL_SIZE=2048 +CONFIG_BT_RX_STACK_SIZE=1200 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=n