interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,670 Commits 65 Branches 14 Tags 102 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
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