-
Notifications
You must be signed in to change notification settings - Fork 368
Allign tcl/target/gd32vf103.cfg with the mainline
#1302
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
base: riscv
Are you sure you want to change the base?
Conversation
This reverts commit 13cfec4 ("Update gd32vf103.cfg (riscv-collab#640)") Change-Id: I505f12a78efc2da498adb0648116581a5103ec4c Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
The file was patched in riscv-collab#538. The patch was then upstreamed and further refined in [1]. This resulted in merge conflicts that were poorly resolved. Fix the resolutions by resetting the file to the version from the mainline OpenOCD (commit 7ac389c ("tcl/target/gd32vf103: work around broken ndmreset")). Link: https://review.openocd.org/c/openocd/+/6957 [1] Change-Id: I2663553fead59f3615a2d6af0aebe500ae086525 Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
|
@groencode, @tchebb, FIY. |
|
@tom-van, could you please take a look at this one? |
|
We have a couple of old pending patches where author did not respond to my comments
6958: tcl/target/gd32vf103: add main flash alias | https://review.openocd.org/c/openocd/+/6958
Yes, merge it as-is and later we can add |
|
I'm the author of the upstream patches as well as the more fiddly bits of the downstream version. Sorry for disappearing: I was busy when the patches were reviewed and then had forgotten a lot of the details once I had time again. I'll check out the current state of things later today and respond to the upstream patches as appropriate. |
|
Great, welcome back! I still have the Sipeed Longan Nano somewhere on a shelf |
|
I've rebased and responded to both outstanding upstream changelists. I recall now that it was the changes you made to https://review.openocd.org/c/openocd/+/6957 that I kept getting stuck on, not the simpler feedback in the other two. +1 to this PR, too. |
There were two patches to RISC-V OpenOCD that caused the conflicts that were misresolved:
I've reverted #640 -- Specifying the
adapter speedseems better placed in board config or in the command line andtransport select jtagis already present in the mainline version.After that the file was reset to the version for upstream (7ac389c).