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

makefiles/sam0: fix debugging with edbg [backport 2019.10] #12685

Merged
merged 1 commit into from
Nov 11, 2019
Merged

makefiles/sam0: fix debugging with edbg [backport 2019.10] #12685

merged 1 commit into from
Nov 11, 2019

Conversation

kb2ma
Copy link
Member

@kb2ma kb2ma commented Nov 11, 2019

Backport of #12653

Contribution description

OpenOCD should always be included for debugging if JLinkExe is not used.

Testing procedure

run make BOARD=samr21-xpro debug

Issues/PRs references

fixes #12652

@benpicco @kb2ma
makefiles/sam0: fix debugging with edbg
429e63b 
OpenOCD should *always* be included for debugging if JLinkExe is not used.

fixes RIOT-OS#12652

(cherry picked from commit 756cab9)
@kb2ma kb2ma added Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) labels Nov 11, 2019
@kb2ma kb2ma requested a review from benpicco November 11, 2019 10:34
@kb2ma kb2ma mentioned this pull request Nov 11, 2019
Merged
miri64
miri64 approved these changes Nov 11, 2019
View reviewed changes
Copy link
Member

@miri64 miri64 left a comment

Choose a reason for hiding this comment

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

ACK, change is identical to #12653

@miri64 miri64 merged commit 2951de4 into RIOT-OS:2019.10-branch Nov 11, 2019
@miri64
Copy link
Member

miri64 commented Nov 11, 2019

Both Murdock and Travis are happy, Travis just didn't upload the status to Github (I restarted the build so it does hopefully)

@kb2ma
Copy link
Member Author

kb2ma commented Nov 11, 2019

Thanks, @miri64!

@fjmolinas fjmolinas added this to the Release 2020.01 milestone Jan 15, 2020
@fjmolinas fjmolinas removed this from the Release 2020.01 milestone Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miri64 miri64 miri64 approved these changes

@benpicco benpicco Awaiting requested review from benpicco

Assignees
No one assigned
Labels
Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Process: release backport Integration Process: The PR is a release backport of a change previously provided to master Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kb2ma @miri64 @fjmolinas @benpicco