diff options
author | Tim Newsome <tim@sifive.com> | 2023-11-03 10:43:48 -0700 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2023-11-06 09:25:46 -0800 |
commit | b5bd88441c3745e37f87c9940809f212f96c3547 (patch) | |
tree | 45185424e522f840668faf88ebfab333e62065ac /src/helper/align.h | |
parent | b75bfab0261aa06597ee68895884a62eabceec18 (diff) | |
parent | 05ee88915520d1dd82da94a016a9374a1f3a8129 (diff) | |
download | riscv-openocd-b5bd88441c3745e37f87c9940809f212f96c3547.zip riscv-openocd-b5bd88441c3745e37f87c9940809f212f96c3547.tar.gz riscv-openocd-b5bd88441c3745e37f87c9940809f212f96c3547.tar.bz2 |
Merge commit '05ee88915520d1dd82da94a016a9374a1f3a8129' into from_upstream
Conflicts:
src/jtag/drivers/xds110.c
src/target/riscv/riscv.c
src/target/riscv/riscv_semihosting.c
tcl/target/esp_common.cfg
Change-Id: If0c02817df03b7fd700cc84b4da2c02d36737d28
Diffstat (limited to 'src/helper/align.h')
0 files changed, 0 insertions, 0 deletions