diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-11-12 17:25:33 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-11-12 17:25:33 +0300 |
| commit | cabb6000dfd96a72858dfd8165a5e758b9c0b14b (patch) | |
| tree | 2ed1b698af4f13b72dc8178b5169c02bcef45e0c /git-hooks/commit-msg | |
| parent | f9a129271642febac27f93673fd96481aff503ca (diff) | |
| parent | fd62626dff25cf503a25040d3040b0a2bb9b2a76 (diff) | |
| download | riscv-openocd-cabb6000dfd96a72858dfd8165a5e758b9c0b14b.zip riscv-openocd-cabb6000dfd96a72858dfd8165a5e758b9c0b14b.tar.gz riscv-openocd-cabb6000dfd96a72858dfd8165a5e758b9c0b14b.tar.bz2 | |
Merge up to fd62626dff25cf503a25040d3040b0a2bb9b2a76 from upstream
Conflicts are related to `unsigned`->`unisgned int` cleanup:
* `src/jtag/drivers/ftdi.c` -- between
6749c70a3ae891552296888986e6eeae1e17f11a and
a64dc23bf19fb4a7626fbda3c02693523ab5a75b.
* `src/rtos/hwthread.c` -- between
ef3e61bebc53f619f42bb06cfd194cd547cceb69 and
436e6f1770e4da6ec5b52724cfb637e8916b535a.
* `src/target/target.c` and `.h` -- between
53ec10b61da5de553c01f92bddf80c076bd49331 and
e72733d59025b5d595bf955b227e95e5db7305c7.
* `src/target/riscv/*` -- due to
957eb741a0980408fe4d0682fccb99a183f90998 and
fec3b224214e3784b0c00970d2421212402da880.
Resolved by:
* Changing the return type of `riscv_batch_get_dmi_read_op()` to
`uint32_t`.
* Using RISC-V OpenOCD's version in other cases.
Change-Id: Ia6e2129c6fddb1dec26adcd936506af2539412ef
Diffstat (limited to 'git-hooks/commit-msg')
0 files changed, 0 insertions, 0 deletions