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
|
||
|---|---|---|
| .. | ||
| Makefile | ||
| armv4_5_erase_check.inc | ||
| armv4_5_erase_check.s | ||
| armv7m_erase_check.inc | ||
| armv7m_erase_check.s | ||
| stm8_erase_check.inc | ||
| stm8_erase_check.s | ||