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 <[email protected]>

Author: tomchy

modules/mcuboot/Kconfig

@@ -101,4 +101,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

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: c6dbf158a0b8c45beb78aa76412d99f60cd6467f
+      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