Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: sdk-zephyr: [nrf fromlist] modules: hal_nordic: bump regtool to 9.0.0 #21130

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+4 −7
Open

manifest: sdk-zephyr: [nrf fromlist] modules: hal_nordic: bump regtool to 9.0.0 #21130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a025108
scripts: requirements: bump nrf-regtool to 9.0.0
jonathannilsen Mar 18, 2025
e54e7c4
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/requirements-build.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ intelhex
pylint
setuptools==75.2.0
zcbor~=0.8.0
nrf-regtool~=8.1.3
nrf-regtool==9.0.0
windows-curses; sys_platform == 'win32'
unidiff
pycryptodome==3.21.0
7 changes: 2 additions & 5 deletions scripts/requirements-fixed.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ coverage==7.6.4 ; python_version >= "3.12" and python_version < "4.0"
cryptography==44.0.1 ; python_version >= "3.12" and python_version < "4.0"
debian-inspector==31.1.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
deprecated==1.2.14 ; python_version >= "3.12" and python_version < "4.0"
devicetree==0.0.2 ; python_version >= "3.12" and python_version < "4.0"
dill==0.3.7 ; python_version >= "3.12" and python_version < "4.0"
dockerfile-parse==2.0.1 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
docopt==0.6.2 ; python_version >= "3.12" and python_version < "4.0"
Expand Down Expand Up @@ -97,7 +96,7 @@ mypy-extensions==1.0.0 ; python_version >= "3.12" and python_version < "4.0"
mypy==1.13.0 ; python_version >= "3.12" and python_version < "4.0"
natsort==8.4.0 ; python_version >= "3.12" and python_version < "4.0"
normality==2.5.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
nrf-regtool==8.1.3 ; python_version >= "3.12" and python_version < "4.0"
nrf-regtool==9.0.0 ; python_version >= "3.12" and python_version < "4.0"
nrfcredstore==1.0.0 ; python_version >= "3.12" and python_version < "4.0"
numpy==2.1.3 ; python_version >= "3.12" and python_version < "4.0"
packageurl-python==0.16.0 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
Expand Down Expand Up @@ -162,7 +161,6 @@ ruff==0.8.1 ; python_version >= "3.12" and python_version < "4.0"
saneyaml==0.6.1 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
scancode-toolkit[full]==31.2.6 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
semver==3.0.2 ; python_version >= "3.12" and python_version < "4.0"
setuptools-scm[toml]==8.0.4 ; python_version >= "3.12" and python_version < "4.0"
setuptools==75.2.0 ; python_version >= "3.12" and python_version < "4.0"
sh==1.14.3 ; python_version >= "3.12" and python_version < "4.0" and sys_platform != "win32"
six==1.16.0 ; python_version >= "3.12" and python_version < "4.0"
Expand All @@ -172,11 +170,10 @@ soupsieve==2.6 ; python_version >= "3.12" and python_version < "4.0" and platfor
spdx-tools==0.7.0a3 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
sphinx-lint==1.0.0 ; python_version >= "3.12" and python_version < "4.0"
stringcase==1.2.0 ; python_version >= "3.12" and python_version < "4.0"
svada==2.1.0 ; python_version >= "3.12" and python_version < "4.0"
svada==2.2.0 ; python_version >= "3.12" and python_version < "4.0"
tabulate==0.9.0 ; python_version >= "3.12" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
toml==0.10.2 ; python_version >= "3.12" and python_version < "4.0"
tomli==2.0.1 ; python_version >= "3.12" and python_version < "4.0"
tomlkit==0.12.1 ; python_version >= "3.12" and python_version < "4.0"
typecode-libmagic==5.39.210531 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
typecode==30.0.2 ; python_version >= "3.12" and python_version < "4.0" and platform_machine == "x86_64"
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 60cd202d25ddbf615f9e542e91eb2b4effb06bcf
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will require sdk-zephyr to be merged first, then this sdk-nrf PR will need to be updated with the new sha and then merged once that is green. In this time window you can't bump sdk-zephyr reference through any other PR as it will lack the nrf-regtool 9.0.0 version in the toolchain, only this one will have it, making it a blocker for all sdk-zephyr manifest changes. Is this is needed because of the major bump of nrf-regtool?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, and not really, I can create a separate PR for the requirements bump to circumvent this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#21152

revision: pull/2663/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading