From 3ffe87981e873a9394d20911a556e95252141be2 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Tue, 9 Sep 2025 07:53:26 +0100 Subject: [PATCH] applications/samples: Don't use minimal libc for MCUboot in CHIP Goes to piclibc, except for nrf54lm20dk which has an issue. Also fixes a wrong selection of a Kconfig which should be done at sysbuild level Signed-off-by: Jamie McCrae --- applications/matter_bridge/sysbuild/mcuboot/prj.conf | 5 ++--- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 4 ++++ samples/matter/light_bulb/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/light_bulb/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/light_switch/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/light_switch/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/lock/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/lock/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/manufacturer_specific/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- .../matter/manufacturer_specific/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/smoke_co_alarm/Kconfig.sysbuild | 6 +++--- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/smoke_co_alarm/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/temperature_sensor/Kconfig.sysbuild | 6 +++--- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/temperature_sensor/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/template/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/template/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/thermostat/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/thermostat/sysbuild/mcuboot/prj.conf | 5 ++--- samples/matter/window_covering/Kconfig.sysbuild | 5 +++-- .../mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf | 5 ++++- samples/matter/window_covering/sysbuild/mcuboot/prj.conf | 5 ++--- 29 files changed, 87 insertions(+), 59 deletions(-) diff --git a/applications/matter_bridge/sysbuild/mcuboot/prj.conf b/applications/matter_bridge/sysbuild/mcuboot/prj.conf index 17ead3e702b..0324b23239f 100644 --- a/applications/matter_bridge/sysbuild/mcuboot/prj.conf +++ b/applications/matter_bridge/sysbuild/mcuboot/prj.conf @@ -15,10 +15,9 @@ CONFIG_FPROTECT=y CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h" -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index eb809a84a9f..f700fa842c2 100644 --- a/samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/contact_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -23,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index 77a196a2835..1bd4290ab27 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/Kconfig.sysbuild @@ -58,12 +58,13 @@ config NETCORE_APP_UPDATE config DFU_MULTI_IMAGE_PACKAGE_NET default y -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf b/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf index 350bdca1992..243b5b97dcb 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf +++ b/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/light_switch/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild index 35d328860cf..de4f655a9cf 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/Kconfig.sysbuild @@ -60,12 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/light_switch/sysbuild/mcuboot/prj.conf b/samples/matter/light_switch/sysbuild/mcuboot/prj.conf index 350bdca1992..243b5b97dcb 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/prj.conf +++ b/samples/matter/light_switch/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild index 35d328860cf..de4f655a9cf 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/Kconfig.sysbuild @@ -60,12 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/lock/sysbuild/mcuboot/prj.conf b/samples/matter/lock/sysbuild/mcuboot/prj.conf index 350bdca1992..243b5b97dcb 100644 --- a/samples/matter/lock/sysbuild/mcuboot/prj.conf +++ b/samples/matter/lock/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/manufacturer_specific/Kconfig.sysbuild b/samples/matter/manufacturer_specific/Kconfig.sysbuild index 46b70e82625..30b29ea50af 100644 --- a/samples/matter/manufacturer_specific/Kconfig.sysbuild +++ b/samples/matter/manufacturer_specific/Kconfig.sysbuild @@ -60,12 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK # Mcuboot padding size is modified to 0x1000 in pm_static file. if SOC_NRF54L10 diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/manufacturer_specific/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/manufacturer_specific/sysbuild/mcuboot/prj.conf b/samples/matter/manufacturer_specific/sysbuild/mcuboot/prj.conf index 84308ea5fbc..421f4a8ed98 100644 --- a/samples/matter/manufacturer_specific/sysbuild/mcuboot/prj.conf +++ b/samples/matter/manufacturer_specific/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/smoke_co_alarm/Kconfig.sysbuild b/samples/matter/smoke_co_alarm/Kconfig.sysbuild index b9dc97c5b75..c85955a498f 100644 --- a/samples/matter/smoke_co_alarm/Kconfig.sysbuild +++ b/samples/matter/smoke_co_alarm/Kconfig.sysbuild @@ -57,13 +57,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK -# Disable checking the external drivers for nRF54L15 DKs. +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK # Mcuboot padding size is modified to 0x1000 in pm_static file. if SOC_NRF54L10 diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/prj.conf b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/prj.conf index 17b3e8b90ff..5df9597e5ab 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/prj.conf +++ b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/temperature_sensor/Kconfig.sysbuild b/samples/matter/temperature_sensor/Kconfig.sysbuild index 389425aae26..be1d23576ad 100644 --- a/samples/matter/temperature_sensor/Kconfig.sysbuild +++ b/samples/matter/temperature_sensor/Kconfig.sysbuild @@ -60,13 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK -# Disable checking the external drivers for nRF54L15 DKs. +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/temperature_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/temperature_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/temperature_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/temperature_sensor/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/temperature_sensor/sysbuild/mcuboot/prj.conf b/samples/matter/temperature_sensor/sysbuild/mcuboot/prj.conf index 84308ea5fbc..421f4a8ed98 100644 --- a/samples/matter/temperature_sensor/sysbuild/mcuboot/prj.conf +++ b/samples/matter/temperature_sensor/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index ac7ef528c05..cb7309e3cf8 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/Kconfig.sysbuild @@ -60,12 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if (BOARD_NRF54L15DK || BOARD_NRF54LM20DK) +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # (BOARD_NRF54L15DK || BOARD_NRF54LM20DK) +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK # Mcuboot padding size is modified to 0x1000 in pm_static file. if SOC_NRF54L10 diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/template/sysbuild/mcuboot/prj.conf b/samples/matter/template/sysbuild/mcuboot/prj.conf index 350bdca1992..243b5b97dcb 100644 --- a/samples/matter/template/sysbuild/mcuboot/prj.conf +++ b/samples/matter/template/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/thermostat/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild index df0eb568b36..44dfc3a46e5 100644 --- a/samples/matter/thermostat/Kconfig.sysbuild +++ b/samples/matter/thermostat/Kconfig.sysbuild @@ -60,12 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/thermostat/sysbuild/mcuboot/prj.conf b/samples/matter/thermostat/sysbuild/mcuboot/prj.conf index 350bdca1992..243b5b97dcb 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/prj.conf +++ b/samples/matter/thermostat/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n diff --git a/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index e3b7d3ef93b..5703acc308f 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/Kconfig.sysbuild @@ -60,12 +60,13 @@ config DFU_MULTI_IMAGE_PACKAGE_NET endif # SOC_SERIES_NRF53X -if BOARD_NRF54L15DK +if BOARD_NRF54L15DK || BOARD_NRF54LM20DK +# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs. config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK default y -endif # BOARD_NRF54L15DK +endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK endif # BOOTLOADER_MCUBOOT diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf index d3b7b8b30b8..f700fa842c2 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54lm20dk_nrf54lm20a_cpuapp.conf @@ -13,7 +13,6 @@ CONFIG_SPI=y CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y # Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB). CONFIG_BOOT_MAX_IMG_SECTORS=512 @@ -24,3 +23,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=512 # reset + 1. Hence, the reboot time increases more and more. # To avoid it enable tickles kernel for mcuboot. CONFIG_TICKLESS_KERNEL=y + +# Use minimal C library instead of picolibc due to fault on this SoC +# KRKNWK-20774 +CONFIG_MINIMAL_LIBC=y diff --git a/samples/matter/window_covering/sysbuild/mcuboot/prj.conf b/samples/matter/window_covering/sysbuild/mcuboot/prj.conf index 350bdca1992..243b5b97dcb 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/prj.conf +++ b/samples/matter/window_covering/sysbuild/mcuboot/prj.conf @@ -13,10 +13,9 @@ CONFIG_PM=n CONFIG_FLASH=y CONFIG_FPROTECT=y -# Use minimal C library instead of the Picolib -CONFIG_MINIMAL_LIBC=y - # Bootloader size optimization +CONFIG_CBPRINTF_NANO=y +CONFIG_PRINTK=n CONFIG_CONSOLE=n CONFIG_SERIAL=n CONFIG_UART_CONSOLE=n