From c7bbffeb4f1ce835caf502de9c261c127c2834ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Tue, 31 Dec 2024 00:07:54 +0100 Subject: [PATCH] manifest: Update zephyr and mcuboot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pull in upmerged revisions of zephyr and mcuboot. Signed-off-by: Andrzej Głąbek --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index 2e17d8112053..a8e75d6805bb 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: ba1d06f7241c1a899b43bdef7b731fa244646a2f + revision: pull/2411/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -130,7 +130,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: b82206c15fff357c151c24bf97c99c4348d14a46 + revision: pull/393/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR