From a224dca8b4fec3413a69ab640f973fb09ad80d45 Mon Sep 17 00:00:00 2001 From: Kamil Piszczek Date: Mon, 28 Jul 2025 11:17:58 +0200 Subject: [PATCH 1/2] samples: bluetooth: fast_pair: locator_tag: fix memory map for nRF54L10 Fixed the memory layout for the nrf54l15dk/nrf54l10/cpuapp target in the Bluetooth Fast Pair Locator Tag sample. Previously, it was assumed that the memory size was 10 KB larger than the actual one. The NVM size in the nRF54L10 SoC is equal to 1012 KB. This change in the nRF54L10 partition map is a breaking change and cannot be performed using DFU. As a result, the DFU procedure will fail if you attempt to upgrade the sample firmware based on one of the nRF Connect SDK v3.0 releases. Ref: NCSDK-34582 Signed-off-by: Kamil Piszczek --- .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 2 +- .../pm_static_nrf54l15dk_nrf54l10_cpuapp.yml | 28 +++++++++---------- .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index fb3d8b2c163e..590a3bf7e0b1 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -6,5 +6,5 @@ /* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ &cpuapp_rram { - reg = < 0x0 DT_SIZE_K(1022) >; + reg = < 0x0 DT_SIZE_K(1012) >; }; diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml b/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml index d5a767a87b4e..b3045cb987b2 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml @@ -9,7 +9,7 @@ mcuboot_primary: - app - mcuboot_pad region: flash_primary - size: 0x7a000 + size: 0x79000 span: *id001 mcuboot_pad: address: 0x6000 @@ -18,38 +18,38 @@ mcuboot_pad: app: address: 0x6800 region: flash_primary - size: 0x79800 + size: 0x78800 mcuboot_primary_app: address: 0x6800 orig_span: &id002 - app region: flash_primary - size: 0x79800 + size: 0x78800 span: *id002 mcuboot_secondary: - address: 0x80000 + address: 0x7f000 orig_span: &id003 - mcuboot_secondary_pad - mcuboot_secondary_app region: flash_primary - size: 0x7a000 + size: 0x79000 span: *id003 mcuboot_secondary_pad: region: flash_primary - address: 0x80000 + address: 0x7f000 size: 0x800 mcuboot_secondary_app: region: flash_primary - address: 0x80800 - size: 0x79800 + address: 0x7f800 + size: 0x78800 -settings_storage: - address: 0xfa000 +bt_fast_pair: + address: 0xf8000 region: flash_primary - size: 0x5000 + size: 0x1000 -bt_fast_pair: - address: 0xff000 +settings_storage: + address: 0xf9000 region: flash_primary - size: 0x800 + size: 0x4000 diff --git a/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay index fb3d8b2c163e..590a3bf7e0b1 100644 --- a/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay +++ b/samples/bluetooth/fast_pair/locator_tag/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -6,5 +6,5 @@ /* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ &cpuapp_rram { - reg = < 0x0 DT_SIZE_K(1022) >; + reg = < 0x0 DT_SIZE_K(1012) >; }; From c5d5074a5ef27f834e86d31341f715a7fe42478c Mon Sep 17 00:00:00 2001 From: Kamil Piszczek Date: Tue, 29 Jul 2025 14:30:41 +0200 Subject: [PATCH 2/2] doc: changelog: fast_pair: mention memory map update for nRF54L10 Added a changelog entry for the Fast Pair Locator Tag sample that describes the update of the memory map for the nrf54l15dk/nrf54l10/cpuapp board target. Ref: NCSDK-34582 Signed-off-by: Kamil Piszczek --- .../releases/release-notes-changelog.rst | 6 ++++++ 1 file changed, 6 insertions(+) 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 24f9dedd4b53..b789e2bd3f4f 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -455,6 +455,12 @@ Bluetooth Fast Pair samples * The advertising to no longer rotate the Resolvable Private Address (RPA) in the DFU mode. * The :ref:`fast_pair_locator_tag_testing_fw_update_notifications` section to improve the test procedure. The application now provides an additional log message to indicate that the firmware version is being read. + * The memory layout for the ``nrf54l15dk/nrf54l10/cpuapp`` board target to fix the out-of-bound partition allocations. + Previously, it was assumed that the memory size for this board target was 10 KB larger than the actual one. + The NVM size in the nRF54L10 SoC is equal to 1012 KB. + + This change in the nRF54L10 partition map is a breaking change and cannot be performed using DFU. + As a result, the DFU procedure will fail if you attempt to upgrade the sample firmware based on one of the |NCS| v3.0 releases. * The configurations for nRF54L-based board targets that store the MCUboot verification key in the KMU peripheral to automatically generate the :file:`keyfile.json` file in the build directory (the ``SB_CONFIG_MCUBOOT_GENERATE_DEFAULT_KMU_KEYFILE`` Kconfig option) based on the input file provided by the ``SB_CONFIG_BOOT_SIGNATURE_KEY_FILE`` Kconfig option. This KMU provisioning step can now be performed automatically by the west runner, provided that a :file:`keyfile.json` file is present in the build directory. The provisioning is only performed if the ``west flash`` command is executed with the ``--erase`` or ``--recover`` flag.