interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'riscv' into small_progbuf 

Change-Id: I1d48cb1f8448ebbf98c8bb369928d1e7a7a78c75
This commit is contained in:
Tim Newsome 2017-11-01 13:38:17 -07:00
parent db754536e8 8304e1ba47
commit e28abf7c9e
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -28,5 +28,5 @@ matrix:
- gcc-multilib - gcc-multilib
script: script:
- ./bootstrap && ./configure && make - ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi && make
- file src/openocd - file src/openocd

2
src/flash/nor/stm32f2x.c
View File

@ -1321,7 +1321,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command)
* this will also force a device unlock if set */ * this will also force a device unlock if set */
stm32x_info->option_bytes.RDP = 0xAA; stm32x_info->option_bytes.RDP = 0xAA;
if (stm32x_info->has_optcr2_pcrop) { if (stm32x_info->has_optcr2_pcrop) {
stm32x_info->option_bytes.optcr2_pcrop = OPTCR2_PCROP_RDP | (~1 << bank->num_sectors); stm32x_info->option_bytes.optcr2_pcrop = OPTCR2_PCROP_RDP | (~1U << bank->num_sectors);
} }
if (stm32x_write_options(bank) != ERROR_OK) { if (stm32x_write_options(bank) != ERROR_OK) {

4
src/target/riscv/riscv-013.c
View File

@ -147,10 +147,6 @@ typedef struct {
unsigned datacount; unsigned datacount;
/* Number of words in the Program Buffer. */ /* Number of words in the Program Buffer. */
unsigned progbufsize; unsigned progbufsize;
/* Number of Program Buffer registers. */
/* Number of words in Debug RAM. */
uint64_t tselect;
bool tselect_dirty;
/* The value that mstatus actually has on the target right now. This is not /* The value that mstatus actually has on the target right now. This is not
* the value we present to the user. That one may be stored in the * the value we present to the user. That one may be stored in the
* reg_cache. */ * reg_cache. */