Skip to content

samples: boot: Adjustments for mcuboot crypto #201

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

samples: boot: Adjustments for mcuboot crypto #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5717182
boards: dts: Update memory layout for nRF54L
Vge0rge Jul 9, 2025
2af5420
samples: boot: Adjustments for mcuboot crypto
michalek-no Jul 7, 2025
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
18 changes: 9 additions & 9 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@
#address-cells = <1>;
#size-cells = <1>;

softdevice_static_ram: partition@20000000 {
label = "softdevice_static_ram";
reg = <0x20000000 DT_SIZE_K(5)>;
app_ram: partition@20000000 {
label = "app_ram";
reg = <0x20000000 DT_SIZE_K(78)>;
};

softdevice_dynamic_ram: partition@20001678 {
label = "softdevice_dynamic_ram";
reg = <0x20001678 DT_SIZE_K(12)>;
softdevice_static_ram: partition@20013800 {
label = "softdevice_static_ram";
reg = <0x20013800 DT_SIZE_K(5)>;
};

app_ram: partition@20004678 {
label = "app_ram";
reg = <0x20004678 DT_SIZE_K(78)>;
softdevice_dynamic_ram: partition@20014BCE {
label = "softdevice_dynamic_ram";
reg = <0x20014BCE DT_SIZE_K(12)>;
};
};
};
18 changes: 9 additions & 9 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@
#address-cells = <1>;
#size-cells = <1>;

softdevice_static_ram: partition@20000000 {
label = "softdevice_static_ram";
reg = <0x20000000 DT_SIZE_K(5)>;
app_ram: partition@20000000 {
label = "app_ram";
reg = <0x20000000 DT_SIZE_K(78)>;
};

softdevice_dynamic_ram: partition@20001400 {
label = "softdevice_dynamic_ram";
reg = <0x20001400 DT_SIZE_K(12)>;
softdevice_static_ram: partition@20013800 {
label = "softdevice_static_ram";
reg = <0x20013800 DT_SIZE_K(5)>;
};

app_ram: partition@20004400 {
label = "app_ram";
reg = <0x20004400 DT_SIZE_K(78)>;
softdevice_dynamic_ram: partition@20014BCE {
label = "softdevice_dynamic_ram";
reg = <0x20014BCE DT_SIZE_K(12)>;
};
};
};
18 changes: 9 additions & 9 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@
#address-cells = <1>;
#size-cells = <1>;

softdevice_static_ram: partition@20000000 {
label = "softdevice_static_ram";
reg = <0x20000000 DT_SIZE_K(5)>;
app_ram: partition@20000000 {
label = "app_ram";
reg = <0x20000000 DT_SIZE_K(174)>;
};

softdevice_dynamic_ram: partition@20001678 {
label = "softdevice_dynamic_ram";
reg = <0x20001678 DT_SIZE_K(12)>;
softdevice_static_ram: partition@2002B800 {
label = "softdevice_static_ram";
reg = <0x2002B800 DT_SIZE_K(5)>;
};

app_ram: partition@20004678 {
label = "app_ram";
reg = <0x20004678 DT_SIZE_K(174)>;
softdevice_dynamic_ram: partition@2002CC00 {
label = "softdevice_dynamic_ram";
reg = <0x2002CC00 DT_SIZE_K(12)>;
};
};
};
18 changes: 9 additions & 9 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@
#address-cells = <1>;
#size-cells = <1>;

softdevice_static_ram: partition@20000000 {
label = "softdevice_static_ram";
reg = <0x20000000 DT_SIZE_K(5)>;
app_ram: partition@20000000 {
label = "app_ram";
reg = <0x20000000 DT_SIZE_K(174)>;
};

softdevice_dynamic_ram: partition@20001400 {
label = "softdevice_dynamic_ram";
reg = <0x20001400 DT_SIZE_K(12)>;
softdevice_static_ram: partition@2002B800 {
label = "softdevice_static_ram";
reg = <0x2002B800 DT_SIZE_K(5)>;
};

app_ram: partition@20004400 {
label = "app_ram";
reg = <0x20004400 DT_SIZE_K(174)>;
softdevice_dynamic_ram: partition@2002CC00 {
label = "softdevice_dynamic_ram";
reg = <0x2002CC00 DT_SIZE_K(12)>;
};
};
};
18 changes: 9 additions & 9 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,19 @@
#address-cells = <1>;
#size-cells = <1>;

softdevice_static_ram: partition@20000000 {
label = "softdevice_static_ram";
reg = <0x20000000 DT_SIZE_K(5)>;
app_ram: partition@20000000{
label = "app_ram";
reg = <0x20000000 DT_SIZE_K(238)>;
};

softdevice_dynamic_ram: partition@20001678 {
label = "softdevice_dynamic_ram";
reg = <0x20001678 DT_SIZE_K(12)>;
softdevice_static_ram: partition@2003B800 {
label = "softdevice_static_ram";
reg = <0x2003B800 DT_SIZE_K(5)>;
};

app_ram: partition@20004678 {
label = "app_ram";
reg = <0x20004678 DT_SIZE_K(238)>;
softdevice_dynamic_ram: partition@2003CC00 {
label = "softdevice_dynamic_ram";
reg = <0x2003CC00 DT_SIZE_K(12)>;
};
};
};
22 changes: 11 additions & 11 deletions boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@

boot_partition: partition@0 {
label = "boot";
reg = <0x00000000 DT_SIZE_K(32)>;
reg = <0x00000000 DT_SIZE_K(40)>;
};

slot0_partition: partition@8000 {
label = "slot0";
reg = <0x00008000 DT_SIZE_K(1298)>;
reg = <0x0000a000 DT_SIZE_K(1290)>;
};

slot1_partition: partition@14c800 {
Expand All @@ -80,19 +80,19 @@
#address-cells = <1>;
#size-cells = <1>;

softdevice_static_ram: partition@20000000 {
label = "softdevice_static_ram";
reg = <0x20000000 DT_SIZE_K(5)>;
app_ram: partition@20000000{
label = "app_ram";
reg = <0x20000000 DT_SIZE_K(238)>;
};

softdevice_dynamic_ram: partition@20001400 {
label = "softdevice_dynamic_ram";
reg = <0x20001400 DT_SIZE_K(12)>;
softdevice_static_ram: partition@2003B800 {
label = "softdevice_static_ram";
reg = <0x2003B800 DT_SIZE_K(5)>;
};

app_ram: partition@20004400 {
label = "app_ram";
reg = <0x20004400 DT_SIZE_K(238)>;
softdevice_dynamic_ram: partition@2003CC00 {
label = "softdevice_dynamic_ram";
reg = <0x2003CC00 DT_SIZE_K(12)>;
};
};
};
5 changes: 5 additions & 0 deletions samples/boot/mcuboot_recovery_retention/sysbuild.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SB_CONFIG_BM_BOOTLOADER_MCUBOOT=y
SB_CONFIG_BM_FIRMWARE_LOADER_BT_MCUMGR=y
SB_CONFIG_SOFTDEVICE_S115=y
SB_CONFIG_BM_BOOTLOADER_MCUBOOT_SIGNATURE_TYPE_ED25519=y
SB_CONFIG_MCUBOOT_GENERATE_DEFAULT_KMU_KEYFILE=y
9 changes: 9 additions & 0 deletions samples/boot/mcuboot_recovery_retention/sysbuild/mcuboot.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
CONFIG_RETAINED_MEM=y
CONFIG_RETENTION=y
CONFIG_RETENTION_BOOT_MODE=y
CONFIG_BOOT_FIRMWARE_LOADER_BOOT_MODE=y
CONFIG_NRF_SECURITY=y
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
CONFIG_PSA_CORE_LITE=y
CONFIG_PSA_CORE_LITE_NSIB_ED25519_OPTIMIZATIONS=y
CONFIG_CRACEN_IKG=n
CONFIG_BOOT_SIGNATURE_USING_KMU=y
CONFIG_LTO=y
CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
2 changes: 1 addition & 1 deletion subsys/softdevice_handler/nrf_sdh_ble.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <ble.h>
#include <zephyr/logging/log.h>

#define APP_RAM_START DT_REG_ADDR(DT_CHOSEN(zephyr_sram))
#define APP_RAM_START DT_REG_ADDR(DT_NODELABEL(softdevice_static_ram))

LOG_MODULE_DECLARE(nrf_sdh, CONFIG_NRF_SDH_LOG_LEVEL);

Expand Down
Loading