From 756282fa0e9f3bcdd5336240d9e6d1f73d35e5d7 Mon Sep 17 00:00:00 2001 From: Karsten Koenig Date: Tue, 24 Sep 2024 10:06:43 +0200 Subject: [PATCH 1/2] scripts: requirements-build.txt: bump nrf-regtool Updated nrf-regtool to latest 6.0.0 Signed-off-by: Karsten Koenig --- scripts/requirements-build.txt | 2 +- scripts/requirements-fixed.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index 78b9ee76ade7..f4d4235ef097 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -6,4 +6,4 @@ imagesize>=1.2.0 intelhex pylint zcbor~=0.8.0 -nrf-regtool~=5.6.0 +nrf-regtool~=6.0.0 diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index 0b5cb4600f00..bfa3c1c5447e 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -69,7 +69,7 @@ msgpack==1.0.5 # via python-can mypy==1.5.1 # via -r zephyr/scripts/requirements-build-test.txt mypy-extensions==1.0.0 # via mypy natsort==8.4.0 # via pyocd -nrf-regtool==5.6.0 # via -r nrf/scripts/requirements-build.txt +nrf-regtool==6.0.0 # via -r nrf/scripts/requirements-build.txt nrfcredstore==1.0.0 # via -r nrf/scripts/requirements-extra.txt numpy==1.26.4 # via svada packaging==24.0 # via -r zephyr/scripts/requirements-base.txt, pkg-about, pytest, python-can, setuptools-scm, west From 9d7de59fa1a4fdd83139728f73a95161bacdbd6c Mon Sep 17 00:00:00 2001 From: Karsten Koenig Date: Tue, 24 Sep 2024 10:07:07 +0200 Subject: [PATCH 2/2] manifest: Bumped sdk-zephyr for tddconf changes UICR generation for TRACE was extended for new fields, so pull in this new feature. Signed-off-by: Karsten Koenig --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 78836eb747bb..6d7e5b0e3a58 100644 --- a/west.yml +++ b/west.yml @@ -72,7 +72,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: f869e11484287622d9a3b63fd50151371966dd0e + revision: 3d01dcc251bf3aa2a675941e8ac2b244f776724d import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above