From 760a547910225e5a79319dafed8528f43d447db1 Mon Sep 17 00:00:00 2001 From: Maciej Baczmanski Date: Wed, 4 Dec 2024 15:18:41 +0100 Subject: [PATCH] samples: matter: add support for nRF54L10 Add support for nRF54L10 in Matter Signed-off-by: Maciej Baczmanski --- .../matter/smoke_co_alarm/Kconfig.sysbuild | 8 +++ .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 24 ++++++++ .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 40 +++++++++++++ .../pm_static_nrf54l15dk_nrf54l10_cpuapp.yml | 56 +++++++++++++++++++ samples/matter/smoke_co_alarm/sample.yaml | 9 ++- .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 32 +++++++++++ .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 25 +++++++++ .../boards/nrf54l15dk_nrf54l15_cpuapp.conf | 2 - samples/matter/template/Kconfig.sysbuild | 6 +- .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 22 ++++++++ .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 39 +++++++++++++ .../pm_static_nrf54l15dk_nrf54l10_cpuapp.yml | 56 +++++++++++++++++++ samples/matter/template/sample.yaml | 12 ++-- .../boards/nrf54l15dk_nrf54l10_cpuapp.conf | 29 ++++++++++ .../boards/nrf54l15dk_nrf54l10_cpuapp.overlay | 25 +++++++++ west.yml | 2 +- 16 files changed, 376 insertions(+), 11 deletions(-) create mode 100644 samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf create mode 100644 samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.overlay create mode 100644 samples/matter/smoke_co_alarm/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml create mode 100644 samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf create mode 100644 samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay create mode 100644 samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf create mode 100644 samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay create mode 100644 samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml create mode 100644 samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf create mode 100644 samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay diff --git a/samples/matter/smoke_co_alarm/Kconfig.sysbuild b/samples/matter/smoke_co_alarm/Kconfig.sysbuild index 2bdbdb297e32..5b39dad8c02f 100644 --- a/samples/matter/smoke_co_alarm/Kconfig.sysbuild +++ b/samples/matter/smoke_co_alarm/Kconfig.sysbuild @@ -59,6 +59,14 @@ config DFU_MULTI_IMAGE_PACKAGE_NET default y endif # SOC_SERIES_NRF53X + +if BOARD_NRF54L15DK + +# Disable checking the external drivers for nRF54L15 DKs. +config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK + default y + +endif # BOARD_NRF54L15DK endif # BOOTLOADER_MCUBOOT #### Enable generating factory data diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf new file mode 100644 index 000000000000..a99b4a807565 --- /dev/null +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -0,0 +1,24 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Multirole is the only currently supported role by SoftDevice. +CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y + +# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families +CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240 +CONFIG_MPSL_WORK_STACK_SIZE=2048 + +# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. +CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 +# Workaround required as Zephyr L2 implies usage of NVS backend for settings. +# It should be removed once the proper fix will be applied in Zephyr. +CONFIG_NVS=n + +# Low Power mode +CONFIG_POWEROFF=y + +# Disabling of unused RAM blocks to reduce power consumption is not yet available for nRF54L10 SoC +CONFIG_RAM_POWER_DOWN_LIBRARY=n diff --git a/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.overlay new file mode 100644 index 000000000000..3b74b803d113 --- /dev/null +++ b/samples/matter/smoke_co_alarm/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + + +/ { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; + + aliases { + // Use watchdog wdt31 as the application watchdog + watchdog0 = &wdt31; + }; +}; + +// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1022)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(192)>; + ranges = <0x0 0x20000000 DT_SIZE_K(192)>; +}; + +// TODO: re-enable HWFC once it's fixed +&uart20 { + /delete-property/ hw-flow-control; +}; + +&mx25r64 { + status = "okay"; +}; + +&wdt31 { + status = "okay"; +}; diff --git a/samples/matter/smoke_co_alarm/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml b/samples/matter/smoke_co_alarm/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml new file mode 100644 index 000000000000..dab5504e69d2 --- /dev/null +++ b/samples/matter/smoke_co_alarm/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml @@ -0,0 +1,56 @@ +mcuboot: + address: 0x0 + region: flash_primary + size: 0xD000 +mcuboot_pad: + address: 0xD000 + region: flash_primary + size: 0x800 +app: + address: 0xD800 + region: flash_primary + size: 0xE7000 +mcuboot_primary: + orig_span: &id001 + - mcuboot_pad + - app + span: *id001 + address: 0xD000 + region: flash_primary + size: 0xE7800 +mcuboot_primary_app: + orig_span: &id002 + - app + span: *id002 + address: 0xD800 + region: flash_primary + size: 0xE7000 +factory_data: + address: 0xF4800 + region: flash_primary + size: 0x1000 +settings_storage: + address: 0xF5800 + region: flash_primary + size: 0xA000 +mcuboot_secondary: + address: 0x0 + orig_span: &id003 + - mcuboot_secondary_pad + - mcuboot_secondary_app + region: external_flash + size: 0xE7800 + span: *id003 +mcuboot_secondary_pad: + region: external_flash + address: 0x0 + size: 0x800 +mcuboot_secondary_app: + region: external_flash + address: 0x800 + size: 0xE7000 +external_flash: + address: 0xE7800 + size: 0x718800 + device: MX25R64 + region: external_flash diff --git a/samples/matter/smoke_co_alarm/sample.yaml b/samples/matter/smoke_co_alarm/sample.yaml index c9523f372f29..ab04421ad8b6 100644 --- a/samples/matter/smoke_co_alarm/sample.yaml +++ b/samples/matter/smoke_co_alarm/sample.yaml @@ -9,7 +9,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.smoke_co_alarm.release: sysbuild: true @@ -20,7 +22,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.smoke_co_alarm.lto: sysbuild: true @@ -30,7 +34,9 @@ tests: - nrf52840dk/nrf52840 - nrf5340dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.smoke_co_alarm.release.nrf54l15.power_consumption: sysbuild: true @@ -39,7 +45,8 @@ tests: CONFIG_NCS_SAMPLE_MATTER_WATCHDOG=n integration_platforms: - nrf54l15dk/nrf54l15/cpuapp - platform_allow: nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l10/cpuapp + platform_allow: nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.smoke_co_alarm.debug.reference: sysbuild: true diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf new file mode 100644 index 000000000000..3301bbe2a56f --- /dev/null +++ b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -0,0 +1,32 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n + +# nRF54L15DK uses SPI NOR external flash +CONFIG_GPIO=y +CONFIG_SPI=y +CONFIG_SPI_NOR=y +CONFIG_SPI_NOR_SFDP_DEVICETREE=y +CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 + +# required by SPI driver +CONFIG_MULTITHREADING=y + +CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y + +# Currently, without tickless kernel, the SYSCOUNTER value after the software +# reset is not set properly and due to that the first system interrupt is not called +# in the proper time - the SYSCOUNTER value is set to the value from before +# reset + 1. Hence, the reboot time increases more and more. +# To avoid it enable tickles kernel for mcuboot. +CONFIG_TICKLESS_KERNEL=y + +# Low Power mode +CONFIG_POWEROFF=y diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay new file mode 100644 index 000000000000..0552388c2baf --- /dev/null +++ b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; +}; + +// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1022)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(192)>; + ranges = <0x0 0x20000000 DT_SIZE_K(192)>; +}; + +&mx25r64 { + status = "okay"; +}; diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 704a27293f2a..c0915991a16b 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -4,8 +4,6 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# TODO: Workaround Fprotect is not supported on nRF54l15 yet. -CONFIG_FPROTECT=n # TODO: Workaround, disable memory guard to avoid false faults in application after boot CONFIG_HW_STACK_PROTECTION=n diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index 62fb2e26e460..3191080bb1e6 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -63,9 +63,9 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS +if BOARD_NRF54L15DK -# Disable checking the external drivers for NS build. +# Disable checking the external drivers for nRF54L15 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y @@ -73,7 +73,7 @@ config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK config PM_MCUBOOT_PAD default 0x800 -endif # BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS +endif # BOARD_NRF54L15DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf new file mode 100644 index 000000000000..54bd447e2674 --- /dev/null +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -0,0 +1,22 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# Multirole is the only currently supported role by SoftDevice. +CONFIG_BT_LL_SOFTDEVICE_MULTIROLE=y + +# nRF54L15 requires bigger stack sizes than nRF52/nRF53 families +CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=10240 +CONFIG_MPSL_WORK_STACK_SIZE=2048 + +# Set the ZMS sector count to match the settings partition size that is 40 kB for this application. +CONFIG_SETTINGS_ZMS_SECTOR_COUNT=10 + +# Workaround required as Zephyr L2 implies usage of NVS backend for settings. +# It should be removed once the proper fix will be applied in Zephyr. +CONFIG_NVS=n + +# Disabling of unused RAM blocks to reduce power consumption is not yet available for nRF54L10 SoC +CONFIG_RAM_POWER_DOWN_LIBRARY=n diff --git a/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay new file mode 100644 index 000000000000..d1ef8beb65ff --- /dev/null +++ b/samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + aliases { + // Use watchdog wdt31 as the application watchdog + watchdog0 = &wdt31; + }; + + chosen { + nordic,pm-ext-flash = &mx25r64; + }; +}; + +// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1022)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(192)>; + ranges = <0x0 0x20000000 DT_SIZE_K(192)>; +}; + +// TODO: re-enable HWFC once it's fixed +&uart20 { + /delete-property/ hw-flow-control; +}; + +&mx25r64 { + status = "okay"; +}; + +&wdt31 { + status = "okay"; +}; diff --git a/samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml b/samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml new file mode 100644 index 000000000000..dab5504e69d2 --- /dev/null +++ b/samples/matter/template/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml @@ -0,0 +1,56 @@ +mcuboot: + address: 0x0 + region: flash_primary + size: 0xD000 +mcuboot_pad: + address: 0xD000 + region: flash_primary + size: 0x800 +app: + address: 0xD800 + region: flash_primary + size: 0xE7000 +mcuboot_primary: + orig_span: &id001 + - mcuboot_pad + - app + span: *id001 + address: 0xD000 + region: flash_primary + size: 0xE7800 +mcuboot_primary_app: + orig_span: &id002 + - app + span: *id002 + address: 0xD800 + region: flash_primary + size: 0xE7000 +factory_data: + address: 0xF4800 + region: flash_primary + size: 0x1000 +settings_storage: + address: 0xF5800 + region: flash_primary + size: 0xA000 +mcuboot_secondary: + address: 0x0 + orig_span: &id003 + - mcuboot_secondary_pad + - mcuboot_secondary_app + region: external_flash + size: 0xE7800 + span: *id003 +mcuboot_secondary_pad: + region: external_flash + address: 0x0 + size: 0x800 +mcuboot_secondary_app: + region: external_flash + address: 0x800 + size: 0xE7000 +external_flash: + address: 0xE7800 + size: 0x718800 + device: MX25R64 + region: external_flash diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 0f1b14dac44c..61bb130197b5 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -12,8 +12,9 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns + nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.template.release: sysbuild: true @@ -26,8 +27,9 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns + nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.template.lto: sysbuild: true @@ -39,8 +41,9 @@ tests: - nrf5340dk/nrf5340/cpuapp - nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp + nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.template.smp_dfu: sysbuild: true @@ -53,8 +56,9 @@ tests: - nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns + - nrf54l15dk/nrf54l10/cpuapp platform_allow: nrf52840dk/nrf52840 nrf5340dk/nrf5340/cpuapp nrf7002dk/nrf5340/cpuapp - nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns + nrf54l15dk/nrf54l15/cpuapp nrf54l15dk/nrf54l15/cpuapp/ns nrf54l15dk/nrf54l10/cpuapp tags: sysbuild ci_samples_matter sample.matter.template.smp_dfu.nrf54h20: sysbuild: true diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf new file mode 100644 index 000000000000..b57ff9794929 --- /dev/null +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf @@ -0,0 +1,29 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# TODO: Workaround, disable memory guard to avoid false faults in application after boot +CONFIG_HW_STACK_PROTECTION=n + +CONFIG_BOOT_WATCHDOG_FEED=n + +# nRF54L15DK uses SPI NOR external flash +CONFIG_GPIO=y +CONFIG_SPI=y +CONFIG_SPI_NOR=y +CONFIG_SPI_NOR_SFDP_DEVICETREE=y +CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 + +# required by SPI driver +CONFIG_MULTITHREADING=y + +CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y + +# Currently, without tickless kernel, the SYSCOUNTER value after the software +# reset is not set properly and due to that the first system interrupt is not called +# in the proper time - the SYSCOUNTER value is set to the value from before +# reset + 1. Hence, the reboot time increases more and more. +# To avoid it enable tickles kernel for mcuboot. +CONFIG_TICKLESS_KERNEL=y diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay new file mode 100644 index 000000000000..0552388c2baf --- /dev/null +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.overlay @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; +}; + +// restore full RRAM and SRAM space - by default some parts are dedicated to FLRP +&cpuapp_rram { + reg = <0x0 DT_SIZE_K(1022)>; +}; + +&cpuapp_sram { + reg = <0x20000000 DT_SIZE_K(192)>; + ranges = <0x0 0x20000000 DT_SIZE_K(192)>; +}; + +&mx25r64 { + status = "okay"; +}; diff --git a/west.yml b/west.yml index 5685db800830..6a1182570879 100644 --- a/west.yml +++ b/west.yml @@ -159,7 +159,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: v2.9.0-rc1 + revision: a0d2cc5b2164aa145284a6f0de5adbca837ea972 west-commands: scripts/west/west-commands.yml submodules: - name: nlio