diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2025-02-17 17:36:08 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2025-02-17 17:38:44 +0300 |
| commit | 95cb368095695fc233282264532704c7141d26ed (patch) | |
| tree | 65c2a7148b424dcbe363dbb487f12b5c709909fd /contrib/rpc_examples/ocd_rpc_example.py | |
| parent | fac1412acebf3979e8fa6bb4e8dbf8c7acfc7ce2 (diff) | |
| parent | 1f3f635693a1ddc85f362dc324cb49c3e7b75f27 (diff) | |
| download | riscv-openocd-95cb368095695fc233282264532704c7141d26ed.zip riscv-openocd-95cb368095695fc233282264532704c7141d26ed.tar.gz riscv-openocd-95cb368095695fc233282264532704c7141d26ed.tar.bz2 | |
Merge up to 1f3f635693a1ddc85f362dc324cb49c3e7b75f27 from upstream
Conflict in `src/rtos/hwthread.c` between commit
57dbcb1d02c9a603364d40aebdc5d9bc8c2be2d7 ("Improve a couple of
user/debug messages. (#763)") and commit
7f2db80ebc168d74a56dc8b76be5355ee4878be6 ("rtos/hwthread: Use
LOG_TARGET_xxx()"). Resolved by using `LOG_TARGET_xxx()` without
changing the message.
Change-Id: I1c1ab321b54f2ef8267f0dca63e16ca8ed6b4655
Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
Diffstat (limited to 'contrib/rpc_examples/ocd_rpc_example.py')
0 files changed, 0 insertions, 0 deletions