Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions applications/matter_bridge/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions samples/matter/light_bulb/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/light_bulb/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions samples/matter/light_switch/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/light_switch/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions samples/matter/lock/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This option cannot be removed without fixing Kconfig.sysbuild first, as you mentioned here: #24233 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed


# Increase the maximum number of sectors to 512 to fit the big image size (> 1024 kB).
CONFIG_BOOT_MAX_IMG_SECTORS=512
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/lock/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions samples/matter/manufacturer_specific/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions samples/matter/smoke_co_alarm/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/smoke_co_alarm/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions samples/matter/temperature_sensor/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/temperature_sensor/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions samples/matter/template/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/template/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions samples/matter/thermostat/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions samples/matter/thermostat/sysbuild/mcuboot/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions samples/matter/window_covering/Kconfig.sysbuild
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading