Skip to content

Commit 0c840a9

Browse files
ArekBalysNordicArekBalysNordic
committed
manifest: Update Matter SDK to switch to picolib
Use picolibc in Matter. Fixed a bug in nRF54LM20 configuration that caused the application may enter restricted RAM address and fall into a fatal error. Signed-off-by: Arkadiusz Balys <[email protected]>
1 parent d62fc19 commit 0c840a9

File tree

63 files changed

+2
-508
lines changed

Some content is hidden

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

63 files changed

+2
-508
lines changed

‎samples/matter/contact_sensor/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
};
1616
};
1717

18-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
19-
&cpuapp_rram {
20-
reg = <0x0 DT_SIZE_K(2036)>;
21-
};
22-
23-
&cpuapp_sram {
24-
reg = <0x20000000 DT_SIZE_K(512)>;
25-
ranges = <0x0 0x20000000 0x80000>;
26-
};
27-
2818
&mx25r64 {
2919
status = "okay";
3020
};

‎samples/matter/contact_sensor/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
};
1212
};
1313

14-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
15-
&cpuapp_rram {
16-
reg = <0x0 DT_SIZE_K(2036)>;
17-
};
18-
19-
&cpuapp_sram {
20-
reg = <0x20000000 DT_SIZE_K(512)>;
21-
ranges = <0x0 0x20000000 0x80000>;
22-
};
23-
2414
&mx25r64 {
2515
status = "disabled";
2616
};

‎samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512
2323
# reset + 1. Hence, the reboot time increases more and more.
2424
# To avoid it enable tickles kernel for mcuboot.
2525
CONFIG_TICKLESS_KERNEL=y
26-
27-
# Use minimal C library instead of picolibc due to fault on this SoC
28-
# KRKNWK-20774
29-
CONFIG_MINIMAL_LIBC=y

‎samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010
};
1111
};
1212

13-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
14-
&cpuapp_rram {
15-
reg = <0x0 DT_SIZE_K(2036)>;
16-
};
17-
18-
&cpuapp_sram {
19-
reg = <0x20000000 DT_SIZE_K(512)>;
20-
ranges = <0x0 0x20000000 0x80000>;
21-
};
22-
2313
&mx25r64 {
2414
status = "okay";
2515
};

‎samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,3 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512
2828
# reset + 1. Hence, the reboot time increases more and more.
2929
# To avoid it enable tickles kernel for mcuboot.
3030
CONFIG_TICKLESS_KERNEL=y
31-
32-
# Use minimal C library instead of picolibc due to fault on this SoC
33-
# KRKNWK-20774
34-
CONFIG_MINIMAL_LIBC=y

‎samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
8-
&cpuapp_rram {
9-
reg = <0x0 DT_SIZE_K(2036)>;
10-
};
11-
12-
&cpuapp_sram {
13-
reg = <0x20000000 DT_SIZE_K(512)>;
14-
ranges = <0x0 0x20000000 0x80000>;
15-
};
16-
177
/* Disable the external flash, as it's not needed
188
* for the configuration with secondary slot residing
199
* in the internal RRAM.

‎samples/matter/light_bulb/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@
2525
};
2626
};
2727

28-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
29-
&cpuapp_rram {
30-
reg = <0x0 DT_SIZE_K(2036)>;
31-
};
32-
33-
&cpuapp_sram {
34-
reg = <0x20000000 DT_SIZE_K(512)>;
35-
ranges = <0x0 0x20000000 0x80000>;
36-
};
37-
3828
&pwm20 {
3929
status = "okay";
4030
pinctrl-0 = <&pwm_default>;

‎samples/matter/light_bulb/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@
2121
};
2222
};
2323

24-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
25-
&cpuapp_rram {
26-
reg = <0x0 DT_SIZE_K(2036)>;
27-
};
28-
29-
&cpuapp_sram {
30-
reg = <0x20000000 DT_SIZE_K(512)>;
31-
ranges = <0x0 0x20000000 0x80000>;
32-
};
33-
3424
&pwm20 {
3525
status = "okay";
3626
pinctrl-0 = <&pwm_default>;

‎samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,3 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512
2323
# reset + 1. Hence, the reboot time increases more and more.
2424
# To avoid it enable tickles kernel for mcuboot.
2525
CONFIG_TICKLESS_KERNEL=y
26-
27-
# Use minimal C library instead of picolibc due to fault on this SoC
28-
# KRKNWK-20774
29-
CONFIG_MINIMAL_LIBC=y

‎samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010
};
1111
};
1212

13-
/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
14-
&cpuapp_rram {
15-
reg = <0x0 DT_SIZE_K(2036)>;
16-
};
17-
18-
&cpuapp_sram {
19-
reg = <0x20000000 DT_SIZE_K(512)>;
20-
ranges = <0x0 0x20000000 0x80000>;
21-
};
22-
2313
&mx25r64 {
2414
status = "okay";
2515
};

0 commit comments

Comments
 (0)