espressif / openocd-esp32

OpenOCD branch with ESP32 JTAG support
Other
362 stars 132 forks source link

[TW#18932] Upstream? (OCD-191) #23

Closed ligius- closed 2 years ago

ligius- commented 7 years ago

Will the changes ever be pushed to the upstream repository? Or will this fork keep up with the main one? There are quite a few new fixes and features upstream and I found myself having to manually integrate this fork as there were some breaking changes upstream (for example src/target/Makefile.am)

cz172638 commented 7 years ago

rebase on top of openocd master and submit for review to openocd gerrit.

satoshinm commented 6 years ago

Hi, I've started an attempt to reconcile the merge conflicts with openocd-esp32 and the current upstream openocd as part of upstreaming it, progress here: https://github.com/satoshinm/openocd/pull/2 - so far it compiles but I have no way yet to test it, maybe helpful as a starting point?

ildar commented 5 years ago

I compared the current upstream and this master. The latter strongly needs to be rebased again. And, BTW, I couldn't find a ticket on upstreaming in https://sourceforge.net/p/openocd/tickets/

ildar commented 5 years ago

BTW the good mirror now is https://github.com/ntfreak/openocd

brainstorm commented 3 years ago

Here's a DirtyJTAG merge (forks ntfreak+espressif+dirtyjtag repos in one)... if somebody is interested in testing DirtyJTAG, which can be flashed on sub-dollar STLinkv2 clones.

Admittedly it's not a very clean merge, I just wanted to get ESP32+DirtyJTAG working, but perhaps can be used to cherrypick and (finally?) upstream this fork at some point in the future?

More context on issue https://github.com/jeanthom/openocd-dirtyjtag/issues/3.

cederom commented 3 years ago

Any updates and / or plans on share back to the OpenOCD upstream?

I am using esp-idf tools Linux version on FreeBSD. OpenOCD-ESP32 is the only tool that depends on Linux libraries that does not work here. This prevents esp-idf/export.sh to work. This is a blocker for ESP-IDF on FreeBSD :-(

We have upstream OpenOCD port on FreeBSD for over 12 years (I have created the initial port). Having native OpenOCD port with ESP32 support would be highly appreciated. There is no point in maintaining two separate diverged concurring packages.

In general it is not cool to fork a project and diverge it with no share back to the upstream. I can see this is the second utility Espressif is developing that way (first is kconfig-frontends). This is not how Open-Source works.

Please consider merging with upstream.

gerekon commented 3 years ago

Hi @cederom

We plan to start upstreamimg our changes the next year. I hope in the beginning of it. Now we are preparing the merge with the recent OpenOCD upstream changes and going onto v0.11

gerekon commented 2 years ago

This year we started upstreaming our changes. The work is in progress. Some chips are already supported. Not all features yet. https://review.openocd.org/c/openocd/+/6889 - semihosting https://review.openocd.org/c/openocd/+/6991 - target/workarea config https://review.openocd.org/c/openocd/+/6989 - New chip support ESP32 https://review.openocd.org/c/openocd/+/6990 - New chip support ESP32-S3 https://review.openocd.org/c/openocd/+/7163 - application tracing functionality over JTAG