interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix flash/run algorithm with new register names 

Change-Id: I8f539c880ee5da864956f56943411b228d8a5812
This commit is contained in:
Tim Newsome 2017-12-21 16:41:50 -08:00
parent fadf2c1b48
commit 1f66c7827b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/nor/fespi.c
View File

@ -792,8 +792,8 @@ static int steps_execute(struct algorithm_steps *as,
int xlen = riscv_xlen(target); int xlen = riscv_xlen(target);
struct reg_param reg_params[2]; struct reg_param reg_params[2];
init_reg_param(&reg_params[0], "x10", xlen, PARAM_OUT); init_reg_param(&reg_params[0], "a0", xlen, PARAM_OUT);
init_reg_param(&reg_params[1], "x11", xlen, PARAM_OUT); init_reg_param(&reg_params[1], "a1", xlen, PARAM_OUT);
buf_set_u64(reg_params[0].value, 0, xlen, ctrl_base); buf_set_u64(reg_params[0].value, 0, xlen, ctrl_base);
buf_set_u64(reg_params[1].value, 0, xlen, data_wa->address); buf_set_u64(reg_params[1].value, 0, xlen, data_wa->address);
while (!as_empty(as)) { while (!as_empty(as)) {

9
src/target/riscv/riscv.c
View File

@ -854,10 +854,13 @@ static int riscv_run_algorithm(struct target *target, int num_mem_params,
uint8_t mstatus_bytes[8]; uint8_t mstatus_bytes[8];
LOG_DEBUG("Disabling Interrupts"); LOG_DEBUG("Disabling Interrupts");
char mstatus_name[20];
sprintf(mstatus_name, "csr%d", CSR_MSTATUS);
struct reg *reg_mstatus = register_get_by_name(target->reg_cache, struct reg *reg_mstatus = register_get_by_name(target->reg_cache,
mstatus_name, 1); "mstatus", 1);
if (!reg_mstatus) {
LOG_ERROR("Couldn't find mstatus!");
return ERROR_FAIL;
}
reg_mstatus->type->get(reg_mstatus); reg_mstatus->type->get(reg_mstatus);
current_mstatus = buf_get_u64(reg_mstatus->value, 0, reg_mstatus->size); current_mstatus = buf_get_u64(reg_mstatus->value, 0, reg_mstatus->size);
uint64_t ie_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE; uint64_t ie_mask = MSTATUS_MIE | MSTATUS_HIE | MSTATUS_SIE | MSTATUS_UIE;