diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts index 2ebb7c08ad..3a90776330 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice.dts @@ -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)>; }; }; }; diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts index 50e9247077..c20c7ab2ee 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_s115_softdevice_mcuboot.dts @@ -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)>; }; }; }; diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts index c6abe6b720..12a0229129 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice.dts @@ -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)>; }; }; }; diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts index 9c22c69470..dce68774bf 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_s115_softdevice_mcuboot.dts @@ -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)>; }; }; }; diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts index d7a50f50aa..9fc9f8d6e6 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice.dts @@ -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)>; }; }; }; diff --git a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts index 83ff82bb73..6b4d698fe5 100644 --- a/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts +++ b/boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_s115_softdevice_mcuboot.dts @@ -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 { @@ -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)>; }; }; }; diff --git a/samples/boot/mcuboot_recovery_retention/sysbuild.conf b/samples/boot/mcuboot_recovery_retention/sysbuild.conf new file mode 100644 index 0000000000..ad7ec75270 --- /dev/null +++ b/samples/boot/mcuboot_recovery_retention/sysbuild.conf @@ -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 diff --git a/samples/boot/mcuboot_recovery_retention/sysbuild/mcuboot.conf b/samples/boot/mcuboot_recovery_retention/sysbuild/mcuboot.conf index 256b75898d..ae0dcb16ae 100644 --- a/samples/boot/mcuboot_recovery_retention/sysbuild/mcuboot.conf +++ b/samples/boot/mcuboot_recovery_retention/sysbuild/mcuboot.conf @@ -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 diff --git a/subsys/softdevice_handler/nrf_sdh_ble.c b/subsys/softdevice_handler/nrf_sdh_ble.c index 0218febf68..f8c02acbf9 100644 --- a/subsys/softdevice_handler/nrf_sdh_ble.c +++ b/subsys/softdevice_handler/nrf_sdh_ble.c @@ -11,7 +11,7 @@ #include #include -#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);