Skip to content

Conversation

@bjarki-andreasen
Copy link
Contributor

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

…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 <[email protected]>
(cherry picked from commit c39ad84)
@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
…r country code"

This reverts commit e0ac6cc.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
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ś <[email protected]>
(cherry picked from commit 54aca3e)
Bring latest release of nrfx: 3.7.0.

Signed-off-by: Nikodem Kastelik <[email protected]>
Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit de82f2f)
Introduce instance 0, PDM0, following nrfx 3.7.0 update.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 97dff5b)
… build

Include system_nrf54l.c file when building for bsim.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 9d82a03)
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 <[email protected]>
(cherry picked from commit b2031aa)
…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 <[email protected]>
(cherry picked from commit bc7a5b6)
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 <[email protected]>
(cherry picked from commit 3786b61)
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 <[email protected]>
(cherry picked from commit a9d0eac)
Add support for nRF54H20 EngB in the Nordic HAL glue code.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 40f5ca0)
Make nrfs compatible with the EngB soc revision.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 72ab376)
So that any Haltium based SoC uses the same settings, including nRF54H20
EngB.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 5a4655f)
…nRF54H20 EngB

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

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 091e38b)
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 <[email protected]>
(cherry picked from commit 47212de)
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 <[email protected]>
(cherry picked from commit df9a84e)
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 <[email protected]>
(cherry picked from commit d3ca4fd)
…y code

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

Signed-off-by: Ravi Dondaputi <[email protected]>
(cherry picked from commit 0e2daaa)
@nika-nordic
Copy link
Contributor

isn't this a duplication of existing #2076 ?

@gmarull
Copy link
Member

gmarull commented Oct 9, 2024

isn't this a duplication of existing #2076 ?

it looks like

Copy link
Member

@gmarull gmarull left a comment

Choose a reason for hiding this comment

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

duplicate of #2076, also misses some required changes.

Copy link
Contributor

@anangl anangl left a comment

Choose a reason for hiding this comment

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

also 869b7aa is not a clean cherry-pick because of a conflict with 52f70da.

@bjarki-andreasen
Copy link
Contributor Author

ok, I was asked to create this PR, what a waste of time :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants