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

Jump to bottom

Pull in fromtree changes required for hal_nordic update to nrfx 3.7.0 #2083

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Pull in fromtree changes required for hal_nordic update to nrfx 3.7.0 #2083

wants to merge 18 commits into from
+346 −143

Conversation

bjarki-andreasen
Copy link
Contributor

pulls in required fromtree commits, and reverts commit pointing to PR from upmerge

@gmarull @bjarki-andreasen
[nrf fromtree] scripts: ci: check_compliance: add BOARD_REVISION in K…
712b34a 
…config.board.v2

This is required if boards make use of such definition in their Kconfig
files. In Kconfig.board.v2, only `boards/Kconfig.v2` is loaded, but
BOARD_REVISION is part of `boards/Kconfig`, which can't be loaded in this
context.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit c39ad845f372f67787b79164a30cabe0dd236773)
@NordicBuilder NordicBuilder mentioned this pull request Oct 8, 2024
Open
@NordicBuilder
Copy link
Contributor

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic pull/225/head zephyrproject-rtos/hal_nordic@bc25c09 (master) zephyrproject-rtos/hal_nordic@pull/225/head..bc25c094

Note: This message is automatically posted and updated by the Manifest GitHub Action.

bjarki-andreasen and others added 17 commits October 8, 2024 20:59
@bjarki-andreasen
Revert "[nrf fromlist] manifest: modules: hal: nordic: Pull in fix fo…
a55453d 
…r country code"

This reverts commit e0ac6cc.

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
@ankuns @bjarki-andreasen
[nrf fromtree] manifest: update hal_nordic revision
3cbdff9 
This commit updates revision of hal_nordic to bring the latest changes
in the nRF IEEE 802.15.4 driver.

Signed-off-by: Andrzej Kuroś <andrzej.kuros@nordicsemi.no>
(cherry picked from commit 54aca3e)
@nika-nordic @bjarki-andreasen
[nrf fromtree] manifest: update hal_nordic revision to have nrfx 3.7.0
16f9c0c 
Bring latest release of nrfx: 3.7.0.

Signed-off-by: Nikodem Kastelik <nikodem.kastelik@nordicsemi.no>
Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit de82f2f4cb85d543602a086e7ed6ce2f1bab8e34)
@gmarull @bjarki-andreasen
[nrf fromtree] modules: hal_nordic: align PDM configuration
3c14e79 
Introduce instance 0, PDM0, following nrfx 3.7.0 update.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 97dff5bccb3273ee30f457c3dc74836ec1920af1)
@gmarull @bjarki-andreasen
[nrf fromtree] modules: hal_nordic: add nrf54l system sources to bsim…
bd91906 
… build

Include system_nrf54l.c file when building for bsim.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 9d82a0344447ec0d72944c796d47aa7528ed8e27)
@gmarull @bjarki-andreasen
[nrf fromtree] bluetooth: controller: ll_sw: nordic: align to nrfx 3.7.0
df54be5 
Some enums have been renamed:

- NRF_CCM_EVENT_ENDCRYPT -> NRF_CCM_EVENT_END
- NRF_CCM_TASK_CRYPT -> NRF_CCM_TASK_START

Also adjust some TX power level settings (26/28dBm not always available
depending on the SoC revision).

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit b2031aa20d3814e43aa42c769c5536ee8487373d)
@adamkondraciuk @bjarki-andreasen
[nrf fromtree] drivers: timer: nrf_grtc_timer: Align Zephyr to new AU…
066a23f 
…TOEN read manner

The new GRTC reading manner of the SYSCOUNTER uses hardware mechanism which
allows to keep it alive when any of CPUs is not sleeping. Otherwise
the SYSCOUNTER goes into sleep mode. Thus there is no
longer need to maintain the `CONFIG_NRF_GRTC_SLEEP_ALLOWED` symbol, however
if the user wants to have the SYSCOUNTER enabled all the time the
`CONFIG_NRF_GRTC_ALWAYS_ON` can be used instead.
The nrfx_grtc  driver no longer provides the `wakeup-read-sleep` reading
manner.
Also setting the GRTC clock source is performed by the nrfx_grtc driver so
it has been removed from the `sys_clock_driver_init()` function.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit bc7a5b6781a47da73b4f8f359e9cccd4a2412279)
@nordic-krch @bjarki-andreasen
[nrf fromtree] soc: nordic: Disable asserts on ppr and flpr
88a4008 
Asserts are by default enabled for tests but flpr and ppr are
small cores (<64k) and many tests does not fit in memory with
asserts enabled.

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit 3786b61)
@gmarull @bjarki-andreasen
[nrf fromtree] soc: nordic: nrf54h20: add support for nRF54H20 EngB
869b7aa 
nRF54H20 EngB is a re-label to the existing hardware revision for the
nRF54H20. nRF54H20 (whithout EngX) is becoming the final revision of the
SoC.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit a9d0eacae288393e3686b7c7d6af7a65253e0c9f)
@gmarull @bjarki-andreasen
[nrf fromtree] modules: hal_nordic: add support for nRF54H20 EngB
acf97c4 
Add support for nRF54H20 EngB in the Nordic HAL glue code.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 40f5ca03b594243110eb3a1243299bdb18028b1c)
@gmarull @bjarki-andreasen
[nrf fromtree] modules: hal_nordic: nrfs: add support for nRF54H20 EngB
1be0c18 
Make nrfs compatible with the EngB soc revision.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 72ab376c24ff0e83665d2779ed95637127581a66)
@gmarull @bjarki-andreasen
[nrf fromtree] drivers: adc: nrfx_saadc: use CONFIG_NRF_PLATFORM_HALTIUM
99250a7 
So that any Haltium based SoC uses the same settings, including nRF54H20
EngB.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 5a4655f69fb2c006a4ee0ddcfe4372066b0cb138)
@gmarull @bjarki-andreasen
[nrf fromtree] scripts: west_commands: runners: nrf: add support for …
31b3f69 
…nRF54H20 EngB

Make sure cpuapp/cpurad cores are detected correctly when using nRF54H20
EngB.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 091e38b3f29015cd5a489c348c61c1b3ab92347c)
@gmarull @bjarki-andreasen
[nrf fromtree] boards: nrf54h20dk: introduce revision 0.8.0 (current)
6f9218e 
The current DK is labeled as revision 0.8.0. Until now, no revisions were
needed, but a new hardware spin is coming, so we'll need to keep at least
two revisions in the near future until the final one becomes the default.
Prepare the board for that scenario. Note that the "old" nRF54H20 SoC is
now nRF54H20 EngB.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit 47212de9de8ebdf27ac8a4cb1ab10fd8779a8834)
@gmarull @bjarki-andreasen
[nrf fromtree] boards: nrf54h20dk: add board revision 0.9.0
b476424 
Add a new revision for nRF54H20 DK: 0.9.0. This new hardware spin contains
the final nRF54H20 SoC. Treat it as the default, including twister.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit df9a84ea31773bbaf96278307d5ed222479b0c83)
@gmarull @bjarki-andreasen
[nrf fromtree] tests: lib: cpp: cxx: ignore nRF54H20 DK 0.8.0
b1a5e95 
nRF54H HAL is not compatible with C++98, add new board revisions to the
list so that they are skipped.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
(cherry picked from commit d3ca4fd84fe25e243a9be92362e4103c8674f5e4)
@rado17 @bjarki-andreasen
[nrf fromtree] manifest: modules: hal: nordic: Pull in fix for countr…
6d59d85 
…y code

Pull in changes to pass country code as string to firmware.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
(cherry picked from commit 0e2daaa9fa472471ac9efb3feb9b5ea78d855559)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anangl anangl Awaiting requested review from anangl anangl is a code owner

@carlescufi carlescufi Awaiting requested review from carlescufi

@cvinayak cvinayak Awaiting requested review from cvinayak

@hubertmis hubertmis Awaiting requested review from hubertmis

@jaz1-nordic jaz1-nordic Awaiting requested review from jaz1-nordic

@kl-cruz kl-cruz Awaiting requested review from kl-cruz

@krish2718 krish2718 Awaiting requested review from krish2718

@magp-nordic magp-nordic Awaiting requested review from magp-nordic

@masz-nordic masz-nordic Awaiting requested review from masz-nordic

@nika-nordic nika-nordic Awaiting requested review from nika-nordic

@nordic-krch nordic-krch Awaiting requested review from nordic-krch

@rajb9 rajb9 Awaiting requested review from rajb9

@sachinthegreen sachinthegreen Awaiting requested review from sachinthegreen

@srkanordic srkanordic Awaiting requested review from srkanordic

@udaynordic udaynordic Awaiting requested review from udaynordic

At least 2 approving reviews are required to merge this pull request.

Assignees

@anangl anangl

Labels
area: ADC area: Audio area: Bluetooth Controller area: Bluetooth area: C++ area: Continuous Integration area: Timer area: West manifest manifest-hal_nordic platform: nRF
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@bjarki-andreasen @NordicBuilder @anangl @gmarull @ankuns @nika-nordic @adamkondraciuk @nordic-krch @rado17