Commit 4f040d5
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
- samples/bluetooth/fast_pair/locator_tag
- configuration
- boards
- sysbuild
- b0n
- boards
- configuration
- nrf5340dk_nrf5340_cpuapp_ns
- nrf5340dk_nrf5340_cpuapp
- thingy53_nrf5340_cpuapp_ns
- thingy53_nrf5340_cpuapp
- ipc_radio/boards
- mcuboot/boards
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
229 | 229 | | |
230 | 230 | | |
231 | 231 | | |
232 | | - | |
233 | 232 | | |
234 | | - | |
235 | 233 | | |
236 | 234 | | |
237 | 235 | | |
| |||
250 | 248 | | |
251 | 249 | | |
252 | 250 | | |
253 | | - | |
254 | 251 | | |
255 | | - | |
256 | 252 | | |
257 | 253 | | |
258 | 254 | | |
| |||
679 | 675 | | |
680 | 676 | | |
681 | 677 | | |
682 | | - | |
683 | | - | |
684 | 678 | | |
685 | 679 | | |
686 | 680 | | |
| |||
Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 54 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
35 | | - | |
36 | | - | |
0 commit comments