diff options
| author | Tim Newsome <tim@sifive.com> | 2017-11-01 13:38:17 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2017-11-01 13:38:17 -0700 |
| commit | e28abf7c9e8a28cb689ddb0777a4049f4f1f9e63 (patch) | |
| tree | e577b9a7302cf30f044c01ec81cfc29fbe4417b0 | |
| parent | db754536e8f4fe2edd92c5c0961c8346e2b8882d (diff) | |
| parent | 8304e1ba47caf18d4ce1c0e177976b092355aee1 (diff) | |
| download | riscv-openocd-e28abf7c9e8a28cb689ddb0777a4049f4f1f9e63.zip riscv-openocd-e28abf7c9e8a28cb689ddb0777a4049f4f1f9e63.tar.gz riscv-openocd-e28abf7c9e8a28cb689ddb0777a4049f4f1f9e63.tar.bz2 | |
Merge branch 'riscv' into small_progbuf
Change-Id: I1d48cb1f8448ebbf98c8bb369928d1e7a7a78c75
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/flash/nor/stm32f2x.c | 2 | ||||
| -rw-r--r-- | src/target/riscv/riscv-013.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index f721700..a99f743 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,5 +28,5 @@ matrix: - gcc-multilib script: - - ./bootstrap && ./configure && make + - ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi && make - file src/openocd diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c index 0e4abb5..65cb212 100644 --- a/src/flash/nor/stm32f2x.c +++ b/src/flash/nor/stm32f2x.c @@ -1321,7 +1321,7 @@ COMMAND_HANDLER(stm32x_handle_unlock_command) * this will also force a device unlock if set */ stm32x_info->option_bytes.RDP = 0xAA; 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) { diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index efcc895..8f7dc6a 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -147,10 +147,6 @@ typedef struct { unsigned datacount; /* Number of words in the Program Buffer. */ 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 we present to the user. That one may be stored in the * reg_cache. */ |