diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-06-25 14:51:18 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-06-25 14:51:18 +0300 |
| commit | 2eedd74197f12fb8c30f259207430713291e8ec0 (patch) | |
| tree | 8a27b3ebbdddb49c32477151bc66e339e84b46fe /src/jtag/interface.c | |
| parent | fdd07f127998f8669784fa64b67a43dea97c1837 (diff) | |
| parent | ad87fbd1cf28760795c4e18f3318a2d720e5a8a6 (diff) | |
| download | riscv-openocd-2eedd74197f12fb8c30f259207430713291e8ec0.zip riscv-openocd-2eedd74197f12fb8c30f259207430713291e8ec0.tar.gz riscv-openocd-2eedd74197f12fb8c30f259207430713291e8ec0.tar.bz2 | |
Merge up to ad87fbd1cf28760795c4e18f3318a2d720e5a8a6 from upstream
Conflicts:
* `doc/openocd.texi`: due to d382c95d57c0ad9ed2dcc83c95404babb7647708,
resolved by selecting the upstream version.
* `src/server/gdb_server.c`: between
944fe66f104e356c5fcd2b5c25200cebef9b389c and
92e8823ebdb6d01b41bb5d79af49501d525acd1d. Resolved by adopting the use
of `LOG_TARGET_*`.
* `src/target/target.c`: between
639e68a621b7ae8c4a296ca7e45b47075268fded and
c5358c84ad0d3e7497498e0457cec7785f72910a, selected the version from
`riscv-openocd`.
Change-Id: Ic1327f25e147945e0ec82947a82452501e8ee5de
Diffstat (limited to 'src/jtag/interface.c')
0 files changed, 0 insertions, 0 deletions