From 54ff2020a0f2190cadc12ae1e9ea050bcb0a0c4c Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Mon, 27 Oct 2025 13:53:42 +0100 Subject: [PATCH] mcuboot: Move boot preference Kconfig Move NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE since it is an application Kconfig, not a bootloader one. Signed-off-by: Tomasz Chyrowicz --- modules/mcuboot/Kconfig | 12 ++++++++++++ west.yml | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/mcuboot/Kconfig b/modules/mcuboot/Kconfig index be46461be9e8..ae9d50967583 100644 --- a/modules/mcuboot/Kconfig +++ b/modules/mcuboot/Kconfig @@ -100,4 +100,16 @@ config NRF_MCUBOOT_BOOT_REQUEST_IMPL_RETENTION endchoice + +config NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE + bool "Set boot preference if a slot is marked for test" + help + This option allows to verify boot preference requests through issuing + the image test. + Using this option is not recommended in production systems, because + it will boot any newly transferred image, even if it has a lower + version than the current one. + The rollback protection (using security counters) will still be + effective. + endif # NRF_MCUBOOT_BOOT_REQUEST diff --git a/west.yml b/west.yml index 4065f91bc550..67aead229078 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 980495663735d03d791ff659e254dcc6a299dee0 + revision: pull/3429/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -127,7 +127,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: a8161d7dcccd9503c48678219dd535ebd24b7c3c + revision: pull/563/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR