Tim Newsome
|
868ebdd89c
|
Merge commit '1293ddd65713d6551775b67169387622ada477c1' into from_upstream
This includes
https://sourceforge.net/p/openocd/mailman/message/37710818/, which
should fix #814.
Conflicts:
.travis.yml
contrib/loaders/flash/stm32/stm32f1x.S
contrib/loaders/flash/stm32/stm32f2x.S
doc/openocd.texi
src/rtos/FreeRTOS.c
src/server/gdb_server.c
src/target/riscv/riscv-013.c
src/target/riscv/riscv.c
src/target/riscv/riscv.h
src/target/riscv/riscv_semihosting.c
tcl/target/esp_common.cfg
tcl/target/gd32vf103.cfg
tools/scripts/checkpatch.pl
Change-Id: I1986c13298ca0dafbe3aecaf1b0b35626525e4eb
|
2023-03-16 18:02:35 -07:00 |
|
Tim Newsome
|
e07613de33
|
Merge branch 'master' into from_upstream
Conflicts:
.gitmodules
.travis.yml
jimtcl
src/jtag/core.c
src/jtag/drivers/ftdi.c
src/jtag/drivers/libjaylink
src/jtag/drivers/mpsse.c
src/jtag/drivers/stlink_usb.c
src/rtos/hwthread.c
src/target/riscv/riscv-013.c
src/target/riscv/riscv.c
tcl/board/sifive-hifive1-revb.cfg
Change-Id: I2d26ebeffb4c1374730d2e20e6e2a7710403657c
|
2020-06-23 13:05:43 -07:00 |
|
Tim Newsome
|
c73e06809d
|
Merge branch 'master' into from_upstream
Conflicts:
src/rtos/rtos.c
src/rtos/rtos.h
src/server/gdb_server.c
Change-Id: Icd5a8165fe111f699542530c9cb034faf30e09b2
|
2018-04-09 12:17:08 -07:00 |
Palmer Dabbelt
|
6ba66c9503
|
No Russian
|
2017-10-26 09:32:34 -07:00 |