Merge branch 'riscv' into small_progbuf
Change-Id: I1d48cb1f8448ebbf98c8bb369928d1e7a7a78c75
This commit is contained in:
commit
e28abf7c9e
|
@ -28,5 +28,5 @@ matrix:
|
|||
- gcc-multilib
|
||||
|
||||
script:
|
||||
- ./bootstrap && ./configure && make
|
||||
- ./bootstrap && ./configure --enable-remote-bitbang --enable-jtag_vpi && make
|
||||
- file src/openocd
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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. */
|
||||
|
|
Loading…
Reference in New Issue