From d1e1e526e31807bef271c81d173b50897901853b Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Mon, 15 Sep 2025 14:29:11 +0200 Subject: [PATCH 1/2] manifest: Update mcuboot Pull change from mcuboot to set a custom BOOT_MAX_ALIGN value. Signed-off-by: Pieter De Gendt --- west.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/west.yml b/west.yml index ed07825bff075..f0b15f2ee4b4a 100644 --- a/west.yml +++ b/west.yml @@ -23,6 +23,8 @@ manifest: url-base: https://github.com/zephyrproject-rtos - name: babblesim url-base: https://github.com/BabbleSim + - name: mcuboot + url-base: https://github.com/mcu-tools group-filter: [-babblesim, -optional] @@ -316,7 +318,8 @@ manifest: groups: - crypto - name: mcuboot - revision: aa4fa2b6e17361dd3ce16a60883059778fd147a9 + revision: pull/2453/head + remote: mcuboot path: bootloader/mcuboot groups: - bootloader From a542ad1db3529b79cd00144c6cd8aefd63882d63 Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Mon, 15 Sep 2025 14:30:30 +0200 Subject: [PATCH 2/2] modules: mcuboot: Add Kconfig option for BOOT_MAX_ALIGN Add a configuration option to override the default BOOT_MAX_ALIGN value in mcuboot. This can be used when image slots are on different flash devices. Signed-off-by: Pieter De Gendt --- modules/Kconfig.mcuboot | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/Kconfig.mcuboot b/modules/Kconfig.mcuboot index 7bf1536616ccf..ff905fd5a1e68 100644 --- a/modules/Kconfig.mcuboot +++ b/modules/Kconfig.mcuboot @@ -430,4 +430,13 @@ config MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP when bootloader is in DirectXIP-revert mode. endif +config MCUBOOT_BOOT_MAX_ALIGN + int "Override programmable flash block alignment" + default 0 + help + Allow to override the programmable flash block alignment size. + By default it's set to the maximum of the write block size of + the chosen zephyr,flash node and 8. + This option is ignored if set to zero. + endif # MCUBOOT_BOOTUTIL_LIB