-
Notifications
You must be signed in to change notification settings - Fork 713
Nrf54h20 fromtree oct25 #3371
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.
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
Open
karstenkoenig
wants to merge
14
commits into
nrfconnect:main
Choose a base branch
from
karstenkoenig:nrf54h20_fromtree_oct25
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Nrf54h20 fromtree oct25 #3371
karstenkoenig
wants to merge
14
commits into
nrfconnect:main
from
karstenkoenig:nrf54h20_fromtree_oct25
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The update will fail if the address is outside of this range. This failure might trigger a bad state where the device is non-trivial to recover. Signed-off-by: Håkon Amundsen <[email protected]> (cherry picked from commit 9d5f94f90b05451986f7c37243ae0579e991d734)
Add UICR.SECURESTORAGE configuration based on device tree partitions. Validates partition layout and populates size fields in 1KB units. Handles missing partitions gracefully. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit 38a0f71)
Update the default memory map to include a `secure_storage_partition`, which is divided into at most four subpartitions. These will be used to configure UICR.SECURESTORAGE, if enabled. Signed-off-by: Sebastian Bøe <[email protected]> (cherry picked from commit d5003d9)
…ction Certain SPIM instances in nRF52/53/54L/54H Series provide hardware control of the CSN (chip select) line. Although the standard SPI drivers do not use this feature, it should be possible to configure this line through pinctrl in case some special driver needs this. Signed-off-by: Andrzej Głąbek <[email protected]> (cherry picked from commit ca79733)
Fix an incorrect interpretation of the chip select signal for the SPIM instances. If cs-gpios is used then the chip select pin is used as a GPIO, and should have CTRLSEL=0. Only when NRF_FUN_SPIM_CSN is used should CTRLSEL be configured to enable hardware control of the pin. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit b28b570)
This reverts commit 915e81a. Signed-off-by: Karsten Koenig <[email protected]>
Moved the nrf_etr driver from the drive/misc folder into the recently established driver/debug folder where it is a better fit. Moved the associated files such as bindings and headers accordingly as well. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit d833556ee55b921a675dd239c3cc2330d3605669)
Pinctrl needs to set the needed drive and direction of the pins. Also this later allows automatically setting the clock bit for the traceclk pin. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 85363f9e53e566e32fc10030f05fa28aa5d1bee4)
Added driver and bindings for the coresight nrf submodule. add integrated it for the nrf54h20. The coresight subsystem is a combination of ARM Coresight peripherals that get configured together to achieve a simplified configuration based on a desired operating mode. This also replaces the previous handling in the nrf54h20 soc.c which was powering the subsystem up but not configuring it. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 6066a42)
Replaced the old tddconf with the full coresight driver that configures the coresight peripherals locally on the running core. Also fixed minor bug in the corresponding sample where messages were not shown for the radio core. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 02fb6fa1c8df4e1401430f1012f2e3eb37f991bb)
Make sure the nordic_vpr_launcher gets started after the coresight driver if that is present. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 24353a89387d235d9b507a2a6949dca4cb38b82a)
Added a new convience snippet to redirect logs to STM and then sink them to TPIU where they can be captured by a trace probe. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 0b5bb3c)
The JLinkScript originally configured more than needed which reduces readability, so stripped it down to the minimum. At the same time improved behavior under reset and added ETM to the radiocore JLinkScript. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit a50dc9fb8a894fca284e1f2db1c4d5186f479d5c)
Configure SDP MSPI pins to switch their control to VPR core Signed-off-by: Jakub Zymelka <[email protected]> Signed-off-by: Andrzej Głąbek <[email protected]> Signed-off-by: Magdalena Pastula <[email protected]> Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit a9bcc44) (cherry picked from commit 2e74ea7) (cherry picked from commit 915e81a)
2236013
to
d4272f8
Compare
jonathannilsen
approved these changes
Oct 8, 2025
SebastianBoe
approved these changes
Oct 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pulling in various nrf54h20 updates from upstream as fromtree