-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Bluetooth: Mesh: Add external flash support to DFU samples on nRF54L #24880
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
31 changes: 31 additions & 0 deletions
31
samples/bluetooth/mesh/dfu/distributor/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# | ||
# Copyright (c) 2024 Nordic Semiconductor ASA | ||
# | ||
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
# | ||
################################################################################ | ||
# Application overlay - nrf54l15 | ||
|
||
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n | ||
CONFIG_NVS=n | ||
CONFIG_NVS_LOOKUP_CACHE=n | ||
CONFIG_SETTINGS_NVS_NAME_CACHE=n | ||
CONFIG_ZMS=y | ||
CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y | ||
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 | ||
CONFIG_ZMS_LOOKUP_CACHE=y | ||
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 | ||
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y | ||
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 | ||
CONFIG_BT_RX_STACK_SIZE=5120 | ||
CONFIG_SHELL_STACK_SIZE=2560 | ||
|
||
# External flash specific settings | ||
CONFIG_GPIO=y | ||
CONFIG_SPI=y | ||
CONFIG_SPI_NOR=y | ||
CONFIG_SPI_NOR_SFDP_DEVICETREE=y | ||
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 | ||
# QSPI drivers are enabled by default for some chips. | ||
# Disable it explicitly to be sure QSPI is disabled. | ||
CONFIG_NORDIC_QSPI_NOR=n |
10 changes: 0 additions & 10 deletions
10
samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot.conf
This file was deleted.
Oops, something went wrong.
10 changes: 10 additions & 0 deletions
10
samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/app.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* Copyright (c) 2025 Nordic Semiconductor ASA | ||
* | ||
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
*/ | ||
|
||
/ { | ||
chosen { | ||
zephyr,code-partition = &boot_partition; | ||
}; | ||
}; |
File renamed without changes.
File renamed without changes.
12 changes: 12 additions & 0 deletions
12
...th/mesh/dfu/distributor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
CONFIG_GPIO=y | ||
CONFIG_SPI=y | ||
CONFIG_SPI_NOR=y | ||
CONFIG_SPI_NOR_SFDP_DEVICETREE=y | ||
CONFIG_FLASH=y | ||
CONFIG_MAIN_STACK_SIZE=20480 | ||
CONFIG_BOOT_MAX_IMG_SECTORS=512 | ||
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 | ||
# Ensure that the qspi driver is disabled by default | ||
CONFIG_NORDIC_QSPI_NOR=n | ||
|
||
CONFIG_MULTITHREADING=y |
48 changes: 48 additions & 0 deletions
48
...mesh/dfu/distributor/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/ { | ||
chosen { | ||
nordic,pm-ext-flash = &mx25r64; | ||
zephyr,code-partition = &boot_partition; | ||
}; | ||
}; | ||
|
||
/delete-node/ &boot_partition; | ||
/delete-node/ &slot0_partition; | ||
/delete-node/ &slot1_partition; | ||
|
||
/delete-node/ &storage_partition; | ||
|
||
&cpuapp_rram { | ||
reg = < 0x0 DT_SIZE_K(1524) >; | ||
|
||
partitions { | ||
boot_partition: partition@0 { | ||
label = "mcuboot"; | ||
reg = <0x000000000 0x00014000>; | ||
}; | ||
|
||
slot0_partition: partition@14000 { | ||
label = "image-0"; | ||
reg = <0x000014000 0x0015A000>; | ||
}; | ||
|
||
storage_partition: partition@16E000 { | ||
label = "storage"; | ||
reg = < 0x16E000 0x9000 >; | ||
}; | ||
}; | ||
}; | ||
|
||
&mx25r64 { | ||
status = "okay"; | ||
|
||
partitions { | ||
compatible = "fixed-partitions"; | ||
#address-cells = <1>; | ||
alxelax marked this conversation as resolved.
Show resolved
Hide resolved
|
||
#size-cells = <1>; | ||
|
||
slot1_partition: partition@0 { | ||
label = "image-1"; | ||
reg = <0x000000000 0x0015A000>; | ||
}; | ||
}; | ||
}; |
39 changes: 39 additions & 0 deletions
39
samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/prj.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
CONFIG_PM=n | ||
|
||
CONFIG_MAIN_STACK_SIZE=10240 | ||
|
||
CONFIG_BOOT_SWAP_SAVE_ENCTLV=n | ||
CONFIG_BOOT_ENCRYPT_IMAGE=n | ||
|
||
CONFIG_BOOT_UPGRADE_ONLY=n | ||
CONFIG_BOOT_BOOTSTRAP=n | ||
|
||
### mbedTLS has its own heap | ||
# CONFIG_HEAP_MEM_POOL_SIZE is not set | ||
|
||
CONFIG_FLASH=y | ||
|
||
### Various Zephyr boards enable features that we don't want. | ||
# CONFIG_BT is not set | ||
# CONFIG_I2C is not set | ||
|
||
CONFIG_LOG=y | ||
CONFIG_LOG_MODE_MINIMAL=y | ||
### Ensure Zephyr logging changes don't use more resources | ||
CONFIG_LOG_DEFAULT_LEVEL=0 | ||
### Use info log level by default | ||
CONFIG_MCUBOOT_LOG_LEVEL_INF=y | ||
### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y | ||
CONFIG_CBPRINTF_NANO=y | ||
### Use picolibc to reduce flash usage | ||
CONFIG_PICOLIBC=y | ||
### Disable malloc arena because we don't need it | ||
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0 | ||
|
||
# NCS boot banner | ||
CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot" | ||
|
||
# RTT is used for interacting with the distributor over shell. Having it enabled in mcuboot will | ||
# require a user to manually provide correct _SEGGER_RTT address otherwise RTT Viewer will pick | ||
# wrong buffer and shell will not work. | ||
CONFIG_USE_SEGGER_RTT=n |
19 changes: 19 additions & 0 deletions
19
samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/socs/nrf54l10_cpuapp.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# | ||
# Copyright (c) 2025 Nordic Semiconductor ASA | ||
# | ||
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
# | ||
################################################################################ | ||
CONFIG_BOOT_MAX_IMG_SECTORS=256 | ||
|
||
# Ensure that the SPI NOR driver is disabled by default | ||
CONFIG_SPI_NOR=n | ||
alxelax marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
CONFIG_BOOT_WATCHDOG_FEED=n | ||
|
||
# Ensure the fastest RRAM write operations | ||
CONFIG_NRF_RRAM_WRITE_BUFFER_SIZE=32 | ||
|
||
# Link Time Optimizations | ||
CONFIG_ISR_TABLES_LOCAL_DECLARATION=y | ||
CONFIG_LTO=y |
19 changes: 19 additions & 0 deletions
19
samples/bluetooth/mesh/dfu/distributor/sysbuild/mcuboot/socs/nrf54l15_cpuapp.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# | ||
# Copyright (c) 2025 Nordic Semiconductor ASA | ||
# | ||
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
# | ||
################################################################################ | ||
CONFIG_BOOT_MAX_IMG_SECTORS=256 | ||
|
||
# Ensure that the SPI NOR driver is disabled by default | ||
CONFIG_SPI_NOR=n | ||
|
||
CONFIG_BOOT_WATCHDOG_FEED=n | ||
|
||
# Ensure the fastest RRAM write operations | ||
CONFIG_NRF_RRAM_WRITE_BUFFER_SIZE=32 | ||
|
||
# Link Time Optimizations | ||
CONFIG_ISR_TABLES_LOCAL_DECLARATION=y | ||
CONFIG_LTO=y |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
30 changes: 30 additions & 0 deletions
30
samples/bluetooth/mesh/dfu/target/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
# | ||
# Copyright (c) 2024 Nordic Semiconductor ASA | ||
# | ||
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
# | ||
################################################################################ | ||
# Application overlay - nrf54l15 | ||
|
||
CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=n | ||
CONFIG_NVS=n | ||
CONFIG_NVS_LOOKUP_CACHE=n | ||
CONFIG_SETTINGS_NVS_NAME_CACHE=n | ||
CONFIG_ZMS=y | ||
CONFIG_SETTINGS_ZMS_CUSTOM_SECTOR_COUNT=y | ||
CONFIG_SETTINGS_ZMS_SECTOR_COUNT=8 | ||
CONFIG_ZMS_LOOKUP_CACHE=y | ||
CONFIG_ZMS_LOOKUP_CACHE_SIZE=512 | ||
CONFIG_ZMS_LOOKUP_CACHE_FOR_SETTINGS=y | ||
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096 | ||
CONFIG_BT_RX_STACK_SIZE=5120 | ||
|
||
# External flash specific settings | ||
CONFIG_GPIO=y | ||
CONFIG_SPI=y | ||
CONFIG_SPI_NOR=y | ||
CONFIG_SPI_NOR_SFDP_DEVICETREE=y | ||
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 | ||
# QSPI drivers are enabled by default for some chips. | ||
# Disable it explicitly to be sure QSPI is disabled. | ||
CONFIG_NORDIC_QSPI_NOR=n |
10 changes: 10 additions & 0 deletions
10
samples/bluetooth/mesh/dfu/target/sysbuild/mcuboot/app.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
/* Copyright (c) 2025 Nordic Semiconductor ASA | ||
* | ||
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause | ||
*/ | ||
|
||
/ { | ||
chosen { | ||
zephyr,code-partition = &boot_partition; | ||
}; | ||
}; |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
samples/bluetooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf52840dongle_nrf52840.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# The UART is used for Serial Recovery, so logging requires | ||
alxelax marked this conversation as resolved.
Show resolved
Hide resolved
|
||
# an RTT console, which is not available out of the box on this board. | ||
# Disable logging. | ||
CONFIG_LOG=n | ||
|
||
# Serial | ||
CONFIG_CONSOLE=n | ||
CONFIG_SERIAL=y | ||
CONFIG_UART_NRFX=n | ||
CONFIG_UART_INTERRUPT_DRIVEN=y | ||
CONFIG_UART_LINE_CTRL=y | ||
|
||
# MCUBoot serial | ||
CONFIG_GPIO=y | ||
CONFIG_MCUBOOT_SERIAL=y | ||
CONFIG_BOOT_SERIAL_CDC_ACM=y | ||
|
||
# Required by USB | ||
CONFIG_MULTITHREADING=y | ||
|
||
# USB | ||
CONFIG_USB_DEVICE_STACK=y | ||
CONFIG_USB_DEVICE_REMOTE_WAKEUP=n | ||
CONFIG_USB_DEVICE_PRODUCT="MCUBOOT" | ||
|
||
CONFIG_NORDIC_QSPI_NOR=n |
12 changes: 12 additions & 0 deletions
12
...uetooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
CONFIG_GPIO=y | ||
CONFIG_SPI=y | ||
CONFIG_SPI_NOR=y | ||
CONFIG_SPI_NOR_SFDP_DEVICETREE=y | ||
CONFIG_FLASH=y | ||
CONFIG_MAIN_STACK_SIZE=20480 | ||
CONFIG_BOOT_MAX_IMG_SECTORS=512 | ||
CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 | ||
# Ensure that the qspi driver is disabled by default | ||
CONFIG_NORDIC_QSPI_NOR=n | ||
|
||
CONFIG_MULTITHREADING=y |
48 changes: 48 additions & 0 deletions
48
...ooth/mesh/dfu/target/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_ext_flash.overlay
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/ { | ||
chosen { | ||
nordic,pm-ext-flash = &mx25r64; | ||
zephyr,code-partition = &boot_partition; | ||
}; | ||
}; | ||
|
||
/delete-node/ &boot_partition; | ||
/delete-node/ &slot0_partition; | ||
/delete-node/ &slot1_partition; | ||
|
||
/delete-node/ &storage_partition; | ||
|
||
&cpuapp_rram { | ||
reg = < 0x0 DT_SIZE_K(1524) >; | ||
|
||
partitions { | ||
boot_partition: partition@0 { | ||
label = "mcuboot"; | ||
reg = <0x000000000 0x00014000>; | ||
}; | ||
|
||
slot0_partition: partition@14000 { | ||
label = "image-0"; | ||
reg = <0x000014000 0x0015A000>; | ||
}; | ||
|
||
storage_partition: partition@16E000 { | ||
label = "storage"; | ||
reg = < 0x16E000 0x9000 >; | ||
}; | ||
}; | ||
}; | ||
|
||
&mx25r64 { | ||
status = "okay"; | ||
|
||
partitions { | ||
compatible = "fixed-partitions"; | ||
#address-cells = <1>; | ||
#size-cells = <1>; | ||
|
||
slot1_partition: partition@0 { | ||
label = "image-1"; | ||
reg = <0x000000000 0x0015A000>; | ||
}; | ||
}; | ||
}; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.