From 1d24b392219d0b744570ca6ce2dce6bb10613e1f Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Mon, 1 Jun 2026 17:17:36 +0200 Subject: [PATCH] samples/dfu/smp_svr_mini_boot: No Partition manager Disabled partition manager in the single slot sample, added overlays needed for nRF54L15 and nRF54LS05B with no partition manager. Signed-off-by: Andrzej Puzdrowski --- .../dfu/smp_svr_mini_boot/Kconfig.sysbuild | 3 ++ .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 50 ++++++++++++++++++ .../nrf54ls05dk_nrf54ls05b_cpuapp.overlay | 38 ++++++++++++++ samples/dfu/smp_svr_mini_boot/pm_static.yml | 51 ------------------- ...m_static_nrf54ls05dk_nrf54ls05b_cpuapp.yml | 40 --------------- .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 13 +++++ .../nrf54ls05dk_nrf54ls05b_cpuapp.overlay | 13 +++++ .../sysbuild/mcuboot/prj.conf | 1 - 8 files changed, 117 insertions(+), 92 deletions(-) create mode 100644 samples/dfu/smp_svr_mini_boot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay create mode 100644 samples/dfu/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay delete mode 100644 samples/dfu/smp_svr_mini_boot/pm_static.yml delete mode 100644 samples/dfu/smp_svr_mini_boot/pm_static_nrf54ls05dk_nrf54ls05b_cpuapp.yml create mode 100644 samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay create mode 100644 samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay diff --git a/samples/dfu/smp_svr_mini_boot/Kconfig.sysbuild b/samples/dfu/smp_svr_mini_boot/Kconfig.sysbuild index 7f117d10e396..87b1a764a024 100644 --- a/samples/dfu/smp_svr_mini_boot/Kconfig.sysbuild +++ b/samples/dfu/smp_svr_mini_boot/Kconfig.sysbuild @@ -31,4 +31,7 @@ config NETCORE_IPC_RADIO_BT_HCI_IPC config MCUBOOT_IMAGES_ROM_END_OFFSET_AUTO default "ipc_radio;ipc_radio_secondary_app" if MCUBOOT_SIGN_MERGED_BINARY +config PARTITION_MANAGER + default n + source "share/sysbuild/Kconfig" diff --git a/samples/dfu/smp_svr_mini_boot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/dfu/smp_svr_mini_boot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay new file mode 100644 index 000000000000..34ea33e43ddc --- /dev/null +++ b/samples/dfu/smp_svr_mini_boot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_rram { + partitions { + boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; + label = "mcuboot"; + reg = <0x0 0x8000>; + }; + + slot0_partition: partition@8000 { + compatible = "zephyr,mapped-partition"; + label = "image-0"; + reg = <0x8000 0x5a800>; + }; + + littlefs_storage: partition@62800 { + compatible = "zephyr,mapped-partition"; + label = "littlefs-storage"; + reg = <0x62800 0x6000>; + }; + + slot1_partition: partition@68800 { + compatible = "zephyr,mapped-partition"; + label = "image-1"; + reg = <0x68800 0x60800>; + }; + + storage_partition: partition@c9000 { + compatible = "zephyr,mapped-partition"; + label = "storage"; + reg = <0xc9000 0x4000>; + }; + + unallocated: partition@cd000 { + compatible = "zephyr,mapped-partition"; + label = "unallocated"; + reg = <0xcd000 0xb0000>; + }; + }; +}; diff --git a/samples/dfu/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay b/samples/dfu/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay new file mode 100644 index 000000000000..1ef78efcbf22 --- /dev/null +++ b/samples/dfu/smp_svr_mini_boot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/delete-node/ &boot_partition; +/delete-node/ &slot0_partition; +/delete-node/ &slot1_partition; +/delete-node/ &storage_partition; + +&cpuapp_rram { + partitions { + boot_partition: partition@0 { + compatible = "zephyr,mapped-partition"; + label = "mcuboot"; + reg = <0x0 0x10000>; + }; + + slot0_partition: partition@10000 { + compatible = "zephyr,mapped-partition"; + label = "image-0"; + reg = <0x10000 0x36800>; + }; + + slot1_partition: partition@46800 { + compatible = "zephyr,mapped-partition"; + label = "image-1"; + reg = <0x46800 0x36800>; + }; + + empty: partition@7d000 { + compatible = "zephyr,mapped-partition"; + label = "empty"; + reg = <0x7d000 0x2000>; + }; + }; +}; diff --git a/samples/dfu/smp_svr_mini_boot/pm_static.yml b/samples/dfu/smp_svr_mini_boot/pm_static.yml deleted file mode 100644 index 91242021bb7c..000000000000 --- a/samples/dfu/smp_svr_mini_boot/pm_static.yml +++ /dev/null @@ -1,51 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0x8000 -app: - address: 0x8800 - region: flash_primary - size: 0x60000 -mcuboot_pad: - address: 0x8000 - region: flash_primary - size: 0x800 -mcuboot_primary: - address: 0x8000 - orig_span: &id001 - - app - - mcuboot_pad - region: flash_primary - size: 0x60800 - span: *id001 -mcuboot_primary_app: - address: 0x8800 - orig_span: &id002 - - app - region: flash_primary - size: 0x60000 - span: *id002 -mcuboot_secondary: - address: 0x68800 - orig_span: &id003 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: flash_primary - size: 0x60800 - span: *id003 -mcuboot_secondary_pad: - region: flash_primary - address: 0x68800 - size: 0x800 -mcuboot_secondary_app: - region: flash_primary - address: 0x69000 - size: 0x60000 -settings_storage: - address: 0xc9000 - region: flash_primary - size: 0x4000 -unallocated: - address: 0xcd000 - region: flash_primary - size: 0xb0000 diff --git a/samples/dfu/smp_svr_mini_boot/pm_static_nrf54ls05dk_nrf54ls05b_cpuapp.yml b/samples/dfu/smp_svr_mini_boot/pm_static_nrf54ls05dk_nrf54ls05b_cpuapp.yml deleted file mode 100644 index c62ed2dcba4d..000000000000 --- a/samples/dfu/smp_svr_mini_boot/pm_static_nrf54ls05dk_nrf54ls05b_cpuapp.yml +++ /dev/null @@ -1,40 +0,0 @@ -mcuboot: - address: 0x0 - region: flash_primary - size: 0x10000 -mcuboot_pad: - address: 0x10000 - region: flash_primary - size: 0x800 -app: - address: 0x10800 - region: flash_primary - size: 0x36000 -mcuboot_primary: - address: 0x10000 - orig_span: &id001 - - mcuboot_pad - - app - region: flash_primary - size: 0x36800 - span: *id001 -mcuboot_secondary_pad: - region: flash_primary - address: 0x46800 - size: 0x800 -mcuboot_secondary_app: - region: flash_primary - address: 0x47000 - size: 0x36000 -mcuboot_secondary: - address: 0x46800 - orig_span: &id002 - - mcuboot_secondary_pad - - mcuboot_secondary_app - region: flash_primary - size: 0x36800 - span: *id002 -empty: - address: 0x7D000 - size: 0x2000 - region: flash_primary diff --git a/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay new file mode 100644 index 000000000000..33400e221eb2 --- /dev/null +++ b/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "../../../boards/nrf54l15dk_nrf54l15_cpuapp.overlay" + +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay b/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay new file mode 100644 index 000000000000..fc447bccdab5 --- /dev/null +++ b/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay @@ -0,0 +1,13 @@ +/* + * Copyright (c) 2026 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "../../../boards/nrf54ls05dk_nrf54ls05b_cpuapp.overlay" + +/ { + chosen { + zephyr,code-partition = &boot_partition; + }; +}; diff --git a/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/prj.conf b/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/prj.conf index 0e58867bde22..ae76bdbef7cf 100644 --- a/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/prj.conf +++ b/samples/dfu/smp_svr_mini_boot/sysbuild/mcuboot/prj.conf @@ -8,7 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y CONFIG_HW_STACK_PROTECTION=y CONFIG_MAIN_STACK_SIZE=10240 -CONFIG_BOOT_MAX_IMG_SECTORS=256 CONFIG_BOOT_BOOTSTRAP=n CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y