Skip to content

Commit 7a261d5

Browse files
kkasperczyk-noArekBalysNordic
kkasperczyk-no
authored and
ArekBalysNordic
committed
samples: Fixed 54L10 configuration for Matter and Thread
The memory layout for 54L10 in Matter and Thread samples is invalid. This commit fixes it, adds known issue and release note entry Signed-off-by: Kamil Kasperczyk <[email protected]>
1 parent b9a0b9d commit 7a261d5

File tree

14 files changed

+52
-55
lines changed

14 files changed

+52
-55
lines changed

‎doc/nrf/protocols/matter/getting_started/hw_requirements.rst‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -723,15 +723,13 @@ For more information about configuration of memory layouts in Matter, see :ref:`
723723
+=========================================+=====================+===================+=====================+=================+===================+
724724
| Bootloader (mcuboot) | 0 kB (0x0) | 52 kB (0xD000) |- |- |- |
725725
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
726-
| Application (mcuboot_primary/app) | 52 kB (0xD000) | 924 kB (0xE7000) | mcuboot_pad | 52 kB (0xD000) | 4 kB (0x1000) |
726+
| Application (mcuboot_primary/app) | 52 kB (0xD000) | 916 kB (0xE5000) | mcuboot_pad | 52 kB (0xD000) | 4 kB (0x1000) |
727727
| | | +---------------------+-----------------+-------------------+
728-
| | | | mcuboot_primary_app | 56 kB (0xE000) | 920 kB (0xE6000) |
728+
| | | | mcuboot_primary_app | 56 kB (0xE000) | 912 kB (0xE4000) |
729729
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
730-
| Factory data (factory_data) | 976 kB (0xF4000) | 4 kB (0x1000) |- |- |- |
730+
| Factory data (factory_data) | 968 kB (0xF2000) | 4 kB (0x1000) |- |- |- |
731731
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
732-
| Non-volatile storage (settings_storage) | 980 kB (0xF5000) | 40 kB (0xA000) |- |- |- |
733-
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
734-
| Reserved area (reserved) | 1020 kB (0xFF000) | 2 kB (0x800) |- |- |- |
732+
| Non-volatile storage (settings_storage) | 972 kB (0xF3000) | 40 kB (0xA000) |- |- |- |
735733
+-----------------------------------------+---------------------+-------------------+---------------------+-----------------+-------------------+
736734

737735
Application core SRAM primary (size: 0x30000 = 192 kB)
@@ -747,9 +745,9 @@ For more information about configuration of memory layouts in Matter, see :ref:`
747745
+-----------------------------------------+------------------+-------------------+---------------------+-----------------+-----------------+
748746
| Partition | Offset | Size | Partition elements | Element offset | Element size |
749747
+=========================================+==================+===================+=====================+=================+=================+
750-
| Application DFU (mcuboot_secondary) | 0 kB (0x0) | 924 kB (0xE7000) |- |- |- |
748+
| Application DFU (mcuboot_secondary) | 0 kB (0x0) | 916 kB (0xE5000) |- |- |- |
751749
+-----------------------------------------+------------------+-------------------+---------------------+-----------------+-----------------+
752-
| Free space (external_flash) | 924 kB (0xE7000) | 7268 kB (0x719000)|- |- |- |
750+
| Free space (external_flash) | 916 kB (0xE5000) | 7276 kB (0x71B000)|- |- |- |
753751
+-----------------------------------------+------------------+-------------------+---------------------+-----------------+-----------------+
754752

755753
..

‎doc/nrf/releases_and_maturity/known_issues.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,6 +594,14 @@ KRKNWK-20019: The identify time does not update for the endpoint 1 in the Matter
594594

595595
**Workaround:** Remove the identify cluster from the :file:`.zap` file, as this cluster is optional for the aggregator endpoint type.
596596

597+
.. rst-class:: v3-0-2 v3-0-1 v3-0-0 v2-9-0-nRF54H20-1 v2-9-2 v2-9-1 v2-9-0
598+
599+
KRKNWK-20562: The memory layout for the nRF54L10 target is invalid
600+
The declared non-volatile memory layout is 10 kB greater than the actual size.
601+
In case of using the memory area out of bounds, the device might crash or behave unexpectedly.
602+
603+
**Workaround:** Change the nRF54L10 memory layout to end at ``0xFD000`` address.
604+
597605
.. rst-class:: v3-0-1 v3-0-0
598606

599607
KRKNWK-20308: The ``MyCluster.xml`` file example in the :ref:`ug_matter_creating_custom_cluster` user guide does not contain the ``ExtendedCommandResponse`` command

‎doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,9 @@ Matter samples
578578
* :kconfig:option:`CONFIG_CHIP_ICD_ACTIVE_MODE_THRESHOLD` from ``300`` to ``0`` ms for SIT devices.
579579
* :kconfig:option:`CONFIG_CHIP_ICD_FAST_POLLING_INTERVAL` from ``200`` to ``500`` ms.
580580

581+
* The memory layout for the ``nrf54l15dk/nrf54l10/cpuapp`` board target, as the previous one was invalid and allowed to access memory area out of bounds.
582+
The maximum size of the non-volatile area was changed from 1022 kB to 1012 kB, the application partition size was decreased by 8 kB, and the reserved partition was removed.
583+
581584
* :ref:`matter_light_switch_sample`:
582585

583586
* Updated the testing steps to use the proper commands for groupcast binding.

‎samples/matter/manufacturer_specific/boards/nrf54l15dk_nrf54l10_cpuapp.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
1919
&cpuapp_rram {
20-
reg = <0x0 DT_SIZE_K(1022)>;
20+
reg = <0x0 DT_SIZE_K(1012)>;
2121
};
2222

2323
&cpuapp_sram {

‎samples/matter/manufacturer_specific/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,37 @@ mcuboot_pad:
99
app:
1010
address: 0xE000
1111
region: flash_primary
12-
size: 0xE6000
12+
size: 0xE4000
1313
mcuboot_primary:
1414
orig_span: &id001
1515
- mcuboot_pad
1616
- app
1717
span: *id001
1818
address: 0xD000
1919
region: flash_primary
20-
size: 0xE7000
20+
size: 0xE5000
2121
mcuboot_primary_app:
2222
orig_span: &id002
2323
- app
2424
span: *id002
2525
address: 0xE000
2626
region: flash_primary
27-
size: 0xE6000
27+
size: 0xE4000
2828
factory_data:
29-
address: 0xF4000
29+
address: 0xF2000
3030
region: flash_primary
3131
size: 0x1000
3232
settings_storage:
33-
address: 0xF5000
33+
address: 0xF3000
3434
region: flash_primary
3535
size: 0xA000
36-
reserved:
37-
address: 0xFF000
38-
region: flash_primary
39-
size: 0x800
4036
mcuboot_secondary:
4137
address: 0x0
4238
orig_span: &id003
4339
- mcuboot_secondary_pad
4440
- mcuboot_secondary_app
4541
region: external_flash
46-
size: 0xE7000
42+
size: 0xE5000
4743
span: *id003
4844
mcuboot_secondary_pad:
4945
region: external_flash
@@ -52,9 +48,9 @@ mcuboot_secondary_pad:
5248
mcuboot_secondary_app:
5349
region: external_flash
5450
address: 0x1000
55-
size: 0xE6000
51+
size: 0xE4000
5652
external_flash:
57-
address: 0xE7000
58-
size: 0x719000
53+
address: 0xE5000
54+
size: 0x71B000
5955
device: MX25R64
6056
region: external_flash

‎samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
1414
&cpuapp_rram {
15-
reg = <0x0 DT_SIZE_K(1022)>;
15+
reg = <0x0 DT_SIZE_K(1012)>;
1616
};
1717

1818
&cpuapp_sram {

‎samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
2020
&cpuapp_rram {
21-
reg = <0x0 DT_SIZE_K(1022)>;
21+
reg = <0x0 DT_SIZE_K(1012)>;
2222
};
2323

2424
&cpuapp_sram {

‎samples/matter/smoke_co_alarm/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,37 @@ mcuboot_pad:
99
app:
1010
address: 0xE000
1111
region: flash_primary
12-
size: 0xE6000
12+
size: 0xE4000
1313
mcuboot_primary:
1414
orig_span: &id001
1515
- mcuboot_pad
1616
- app
1717
span: *id001
1818
address: 0xD000
1919
region: flash_primary
20-
size: 0xE7000
20+
size: 0xE5000
2121
mcuboot_primary_app:
2222
orig_span: &id002
2323
- app
2424
span: *id002
2525
address: 0xE000
2626
region: flash_primary
27-
size: 0xE6000
27+
size: 0xE4000
2828
factory_data:
29-
address: 0xF4000
29+
address: 0xF2000
3030
region: flash_primary
3131
size: 0x1000
3232
settings_storage:
33-
address: 0xF5000
33+
address: 0xF3000
3434
region: flash_primary
3535
size: 0xA000
36-
reserved:
37-
address: 0xFF000
38-
region: flash_primary
39-
size: 0x800
4036
mcuboot_secondary:
4137
address: 0x0
4238
orig_span: &id003
4339
- mcuboot_secondary_pad
4440
- mcuboot_secondary_app
4541
region: external_flash
46-
size: 0xE7000
42+
size: 0xE5000
4743
span: *id003
4844
mcuboot_secondary_pad:
4945
region: external_flash
@@ -52,9 +48,9 @@ mcuboot_secondary_pad:
5248
mcuboot_secondary_app:
5349
region: external_flash
5450
address: 0x1000
55-
size: 0xE6000
51+
size: 0xE4000
5652
external_flash:
57-
address: 0xE7000
58-
size: 0x719000
53+
address: 0xE5000
54+
size: 0x71B000
5955
device: MX25R64
6056
region: external_flash

‎samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
1414
&cpuapp_rram {
15-
reg = <0x0 DT_SIZE_K(1022)>;
15+
reg = <0x0 DT_SIZE_K(1012)>;
1616
};
1717

1818
&cpuapp_sram {

‎samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP
1919
&cpuapp_rram {
20-
reg = <0x0 DT_SIZE_K(1022)>;
20+
reg = <0x0 DT_SIZE_K(1012)>;
2121
};
2222

2323
&cpuapp_sram {

0 commit comments

Comments
 (0)