Cherry-pick nRF52840 softreset default #2621
Merged
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
… instead of JSON Instead of pre-generating the JSON batch to then execute it, use command-line arguments and --x-append-batch to generate the JSON file tht will then be passed to x-execute-batch. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 6e9e839)
In commit 6e9e839, an indirection via the new `options` dictionary was missed in the SUIT handling. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 51661ef)
…ling This is no longer necessary, because thanks to sysbuild we no longer invoke a runner with a .hex file that is the result of merging builds for more than one core. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit aaefaad)
These are used to detect if the firmware image contains any values inside the UICR for additional handling. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit fa66984)
This is no longer used at all. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 4e8ec16)
The `erase` command was being used but there was no "backend" implementation for it in nrfutil nor nrfjprog. Simplify the syntax and implement it for both tools. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit dc7d8bb)
…tions Commit dc7d8bb introduced the requirement to provide the erase kind when executing the corresponding op, but it was forgotten in this particular spot. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 706689b)
…RF52 series The Nordic nRF52 series have a peculiarity that is not shared with any other Nordic families of SoCs: the reset pin can be reconfigured as a regular GPIO. This has an unintended consequence: if the user has reconfigured the pin in Devicetree to be a GPIO, `west flash` will override that and configure the IC to use it as a reset pin, and the firmware at boot won't be able to switch it back to GPIO, because that requires a UICR erase. This behavior is very confusing to users, because the GPIO does not work at all, since it is now just a reset line. With this patch, `west flash` defaults to using soft reset instead of pin reset for the nRF52 family of devices, to avoid overwriting the reset pin configuration that the user includes in the image. In order to be able to continue to use pin reset for users that so desire it, a new option `--pinreset` is added that forces the use of pin reset. The existing `--softreset` option is left exactly as it was, but it is now applicable only to families other than the nRF52. Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 17a671c)
nordicjm
approved these changes
Mar 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Set of cherry-picks to default to soft reset on 52840.