boards/common/cc26xx cc13xx: clean up and fix flash configs [backport 2023.01]#19167
Merged
bors[bot] merged 5 commits intoRIOT-OS:2023.01-branchfrom Jan 18, 2023
Conversation
This adds the configuration to allow choosing the XDS110 used in cc13xx-launchpad and cc26xx-launchpad boards via the `OPENOCD_DEBUG_ADAPTER` variable. (cherry picked from commit 7bb5232)
Place common OpenOCD configs for the different cc13xx and cc26xx families in boards/common/cc26xx_cc13xx/dist and automatically select the correct one based on the (prefix of the) value of `$(CPU_MODEL)`, if `OPENOCD_CONFIG` was not specified and no custom `openocd.cfg` is located in the board's `dist` folder. The `cc2650-launchpad` and `cc2650stk` have been adapted to use the common config instead. (cherry picked from commit c4ff80b)
Add the required variables to support flashing with `PROGRAMMERS=jlink`. (cherry picked from commit 5c16318)
Typically, OpenOCD is already performing a reset on connect. A `reset halt` to bring the target to a `halt` state for flashing will result in the device going through a second reset cycle. This can be problematic with some device, such as the CC26xx MCUs. For these devices, an `OPENOCD_CMD_RESET_HALT := -c 'halt'` will avoid the second reset that is causing the issues. (cherry picked from commit 3e1dcf3)
This adds a work around that allows flashing with upstream OpenOCD, most of the time. (cherry picked from commit c78c005)
maribu
added
Area: boards
kaspar030
approved these changes
Jan 18, 2023
Contributor
kaspar030
left a comment
kaspar030
left a comment
There was a problem hiding this comment.
backport-ACK.
bors merge
Contributor
|
🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set. |
Contributor
|
bors merge |
Contributor
|
Build succeeded: |
maribu
deleted the
backport/2023.01/boards/common/cc26xx_cc13xx/openocd.cfg
branch
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Backport of #19050
Contribution description
OPENOCD_DEBUG_ADAPTER=xds110boards/common/cc26xx_cc13xxOPENOCD_DEBUG_ADATER ?= xds110boards/cc2650*: drop custom OpenOCD config in favor of shared onePROGRAMMER=jlinkreset halt(which causes a second reset) is causing issues with the ICEPick JTAG routers in the CC26xx - CC13xx deviceshaltinstead ofreset haltfor CC26xx / CC13xx boards in OpenOCD to avoid issues in flashingTesting procedure
Should now work. The same should still work for other cc26xx cc13xx boards.
Issues/PRs references
Partially fixes: #18750