From b95bab47bbffa80324c5ee13d5e71f21db1692f7 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 30 Dec 2024 11:49:03 +0000 Subject: [PATCH 1/2] manifest: Update sdk-mcuboot Updates MCUboot to fix an issue with triple erasing a wrong slot s0/s1 firmware update Signed-off-by: Jamie McCrae --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index bf517319fd1d..a4fb417d699e 100644 --- a/west.yml +++ b/west.yml @@ -130,7 +130,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 99d4ae97314c413208746f1fb272eb4ecf85b3ea + revision: 3a25855215a2cfc64c3f0e2dba3ada3f11df7816 path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR From 079fc7b7d1898fa5817f9c5e46997c90630f5530 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 23 Jan 2025 10:46:43 +0000 Subject: [PATCH 2/2] doc: releases: changelog: Add note on fix of triple erase Adds a note on this fix Signed-off-by: Jamie McCrae --- .../releases_and_maturity/releases/release-notes-changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 326d81da18d3..bc193e9db6e4 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -651,7 +651,7 @@ The code for integrating MCUboot into |NCS| is located in the :file:`ncs/nrf/mod The following list summarizes both the main changes inherited from upstream MCUboot and the main changes applied to the |NCS| specific additions: -|no_changes_yet_note| +* Fixed an issue where an unusable secondary slot was cleared three times instead of once during cleanup. Zephyr ======