Skip to content

Commit 6638616

Browse files
committed
manifest: Update sdk-zephyr and sdk-mcuboot
Update sdk-zephyr and sdk-mcuboot revisions. Signed-off-by: Tomasz Chyrowicz <[email protected]>
1 parent b05ea3c commit 6638616

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

modules/mcuboot/Kconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,16 @@ config NRF_MCUBOOT_BOOT_REQUEST_IMPL_RETENTION
100100

101101
endchoice
102102

103+
104+
config NCS_MCUBOOT_BOOT_REQUEST_TEST_SETS_BOOT_PREFERENCE
105+
bool "Set boot preference if a slot is marked for test"
106+
help
107+
This option allows to verify boot preference requests through issuing
108+
the image test.
109+
Using this option is not recommended in production systems, because
110+
it will boot any newly transferred image, even if it has a lower
111+
version than the current one.
112+
The rollback protection (using security counters) will still be
113+
effective.
114+
103115
endif # NRF_MCUBOOT_BOOT_REQUEST

west.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ manifest:
6565
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6666
- name: zephyr
6767
repo-path: sdk-zephyr
68-
revision: fcb3e3be21e1eda99b7d0a9185a6ef153e022694
68+
revision: pull/3429/head
6969
import:
7070
# In addition to the zephyr repository itself, NCS also
7171
# imports the contents of zephyr/west.yml at the above
@@ -127,7 +127,7 @@ manifest:
127127
compare-by-default: true
128128
- name: mcuboot
129129
repo-path: sdk-mcuboot
130-
revision: a8161d7dcccd9503c48678219dd535ebd24b7c3c
130+
revision: pull/563/head
131131
path: bootloader/mcuboot
132132
- name: qcbor
133133
url: https://github.com/laurencelundblade/QCBOR

0 commit comments

Comments
 (0)