From eabddd58e85e4693ec5e004cbca21812030ed3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Thu, 22 Aug 2024 13:05:00 +0200 Subject: [PATCH] west.yml: Update zephyr to bring in zcbor 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated from 0.8.2 Signed-off-by: Øyvind Rønningstad --- .../releases/release-notes-changelog.rst | 11 ++++++++++- west.yml | 6 ++++++ 2 files changed, 16 insertions(+), 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 7755b0f03fe1..733a0b2f172e 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -944,7 +944,16 @@ Additions specific to |NCS| zcbor ===== -|no_changes_yet_note| +* Updated the zcbor library to version 0.9.0. + Full release notes at https://github.com/NordicSemiconductor/zcbor/blob/0.9.0/RELEASE_NOTES.md + Migration guide at https://github.com/NordicSemiconductor/zcbor/blob/0.9.0/MIGRATION_GUIDE.md + Highlights: + + * Many code generation bugfixes + + * You can now decide at run-time whether the decoder should enforce canonical encoding. + + * Allow --file-header to accept a path to a file with header contents Trusted Firmware-M ================== diff --git a/west.yml b/west.yml index 6c38c6849fbf..e75030afd737 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,13 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr +<<<<<<< HEAD revision: 96aa87c2aae419a2d04f4ee86ef12b359789a817 +||||||| parent of 5e094cba4a (west.yml: Update zephyr to bring in zcbor 0.9.0) + revision: 21646b971a401660a008920d14d02f7956b13d5f +======= + revision: pull/1966/head +>>>>>>> 5e094cba4a (west.yml: Update zephyr to bring in zcbor 0.9.0) import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above