Skip to content

Commit 4f040d5

Browse files
committed
samples: bluetooth: fast_pair: locator_tag: migrate nRF53 targets to DTS
Migrated the Fast Pair Locator Tag sample on the nRF53 board targets away from the deprecated Partition Manager static YAML files to a DTS-based partition layout, in line with the migration style established for the remaining board targets. Documentation updates that go beyond the sample-local README is done in an independent commit. Affected board targets: - nrf5340dk/nrf5340/cpuapp - thingy53/nrf5340/cpuapp Application core changes (configuration/boards/*_cpuapp.overlay): - Defined the full flash0 partition layout (boot_partition, slot0_partition, bt_fast_pair_partition, storage_partition). - Defined the mx25r64 partition layout for slot1_partition (956 KB, matching the original PM offsets) and slot3_partition. - Set slot3_partition to DT_SIZE_K(224) so it matches the upstream RAM-backed slot2_partition in nrf/modules/mcuboot/flash_sim.overlay that MCUboot uses to forward the network core image. - Used DT_SIZE_K() consistently for partition sizes. - Removed the per-board common dtsi files; both /ns variants and the related dtsi includes are gone with the /ns scope removal. Sysbuild overlays (sysbuild/{ipc_radio,b0n,mcuboot}/boards/): - Introduced a single ipc_radio cpunet overlay that defines b0n_partition (matches the Matter reference layout), the bl_storage / provision_partition node and s0_partition sized at DT_SIZE_K(222) so that ih_img_size + ih_hdr_size still fit in the 224 KB flash_sim slot when MCUboot validates the staged network core image. - The b0n overlay reuses the IPC radio cpunet layout via a relative include and only sets zephyr,code-partition to b0n_partition, avoiding any duplication of the cpunet partition map. - The MCUboot overlays continue to include the cpuapp overlay and point zephyr,code-partition at boot_partition. - Disabled CONFIG_MCUBOOT_VERIFY_IMG_ADDRESS, which depends on PM-only macros for the network core slot. Sysbuild configuration (sysbuild/configuration/*/sysbuild.conf): - Disabled SB_CONFIG_PARTITION_MANAGER for the nRF53 board targets. - Kept SB_CONFIG_SECURE_BOOT_NETCORE=y and SB_CONFIG_NETCORE_APP_UPDATE=y so that the upstream s0-partition and flash_sim overlays apply, and aligned the layout with SB_CONFIG_MCUBOOT_NRF53_MULTI_IMAGE_UPDATE. Removed /ns scope (per updated NCSDK-38010 description): - Deleted nrf5340dk/nrf5340/cpuapp/ns and thingy53/nrf5340/cpuapp/ns board configs, overlays, PM static YAMLs, sysbuild folders, and signature key files. - Removed the matching entries from sample.yaml. Project-wide configuration: - Moved CONFIG_USE_DT_CODE_PARTITION=y from per-board *.conf files to configuration/prj.conf and configuration/prj_release.conf, and highlighted it with a leading blank line, mirroring the style of nrf/samples/bluetooth/fast_pair/input_device/prj.conf. Now that every supported target is on DTS partitioning, the option only needs to be set once at the sample level. The b0n image keeps its own CONFIG_USE_DT_CODE_PARTITION=y in sysbuild/b0n/prj.conf since it is a separate sysbuild image. README.rst alignment: - Removed nrf5340dk/nrf5340/cpuapp/ns and thingy53/nrf5340/cpuapp/ns from the DFU solution and signature algorithm tables. - Dropped the /includes/build_and_run_ns.txt include from the Building and running section, as no /ns variant is supported now. Ref: NCSDK-38010 Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
1 parent baa8baf commit 4f040d5

44 files changed

Lines changed: 303 additions & 752 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

samples/bluetooth/fast_pair/locator_tag/README.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,7 @@ The configuration of the DFU solution varies depending on the board target:
229229
| | | * ``nrf54ls05dk/nrf54ls05b/cpuapp`` (only ``release`` configuration) |
230230
+--------------+--------------------------------+----------------------------------------------------------------------+
231231
| MCUboot | overwrite only mode | * ``nrf5340dk/nrf5340/cpuapp`` |
232-
| | | * ``nrf5340dk/nrf5340/cpuapp/ns`` |
233232
| | | * ``thingy53/nrf5340/cpuapp`` |
234-
| | | * ``thingy53/nrf5340/cpuapp/ns`` |
235233
+--------------+--------------------------------+----------------------------------------------------------------------+
236234

237235
Signature algorithm
@@ -250,9 +248,7 @@ The configuration of the signature algorithm and the public key storage solution
250248
| RSA-2048 | * ``nrf52dk/nrf52832`` (only ``release`` configuration) | Bootloader partition | SW calculation, |
251249
| | * ``nrf52833dk/nrf52833`` (only ``release`` configuration) | | Signature derived from |
252250
| | * ``nrf5340dk/nrf5340/cpuapp`` | | image hash |
253-
| | * ``nrf5340dk/nrf5340/cpuapp/ns`` | | |
254251
| | * ``thingy53/nrf5340/cpuapp`` | | |
255-
| | * ``thingy53/nrf5340/cpuapp/ns`` | | |
256252
+--------------------------------+----------------------------------------------------------------------+---------------------------+---------------------------+
257253
| ECDSA-P256 | * ``nrf52840dk/nrf52840`` | Bootloader partition | HW-accelerated |
258254
| | | | (Cryptocell 310), |
@@ -679,8 +675,6 @@ Building and running
679675

680676
.. |sample path| replace:: :file:`samples/bluetooth/fast_pair/locator_tag`
681677

682-
.. include:: /includes/build_and_run_ns.txt
683-
684678
.. |sample_or_app| replace:: sample
685679
.. |ipc_radio_dir| replace:: :file:`sysbuild/ipc_radio`
686680

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52833dk_nrf52833.conf

Lines changed: 0 additions & 8 deletions
This file was deleted.

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52840dk_nrf52840.conf

Lines changed: 0 additions & 8 deletions
This file was deleted.

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf52dk_nrf52832.conf

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,59 @@
11
/*
2-
* Copyright (c) 2024 Nordic Semiconductor ASA
2+
* Copyright (c) 2024-2026 Nordic Semiconductor ASA
33
*
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
#include "nrf5340dk_nrf5340_cpuapp_common.dtsi"
7+
&flash0 {
8+
/* Redefine the "partitions" DTS node. */
9+
/delete-node/ partitions;
10+
11+
partitions {
12+
compatible = "fixed-partitions";
13+
#address-cells = <1>;
14+
#size-cells = <1>;
15+
16+
boot_partition: partition@0 {
17+
label = "mcuboot";
18+
reg = <0x0 DT_SIZE_K(48)>;
19+
};
20+
21+
slot0_partition: partition@c000 {
22+
label = "image-0";
23+
reg = <0xc000 DT_SIZE_K(956)>;
24+
};
25+
26+
bt_fast_pair_partition: partition@fb000 {
27+
reg = <0xfb000 DT_SIZE_K(4)>;
28+
};
29+
30+
storage_partition: partition@fc000 {
31+
label = "storage";
32+
reg = <0xfc000 DT_SIZE_K(16)>;
33+
};
34+
};
35+
};
36+
37+
&mx25r64 {
38+
partitions {
39+
compatible = "fixed-partitions";
40+
#address-cells = <1>;
41+
#size-cells = <1>;
42+
43+
slot1_partition: partition@0 {
44+
label = "image-1";
45+
reg = <0x0 DT_SIZE_K(956)>;
46+
};
47+
48+
/*
49+
* The network core secondary slot must be the same size as
50+
* the corresponding RAM-backed slot2_partition (224 KB). Refer
51+
* to nrf/modules/mcuboot/flash_sim.overlay for the slot2_partition
52+
* definition.
53+
*/
54+
slot3_partition: partition@ef000 {
55+
label = "image-3";
56+
reg = <0xef000 DT_SIZE_K(224)>;
57+
};
58+
};
59+
};

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_common.dtsi

Lines changed: 0 additions & 11 deletions
This file was deleted.

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns.conf

Lines changed: 0 additions & 16 deletions
This file was deleted.

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf5340dk_nrf5340_cpuapp_ns_release.conf

Lines changed: 0 additions & 19 deletions
This file was deleted.

samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.conf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@ CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
3131
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
3232
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
3333
CONFIG_CRACEN_LIB_KMU=n
34-
35-
# Enable code partitioning with DTS
36-
CONFIG_USE_DT_CODE_PARTITION=y

0 commit comments

Comments
 (0)