zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Og' into enable_flash_prog

__archive__
Tim Newsome 2016-11-17 13:44:35 -08:00
parent 18eedf996c 80e8101292
commit c406b4530e
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1337,7 +1337,7 @@ static int kinetis_make_ram_ready(struct target *target)
static int kinetis_write_sections(struct flash_bank *bank, const uint8_t *buffer,
uint32_t offset, uint32_t count)
{
int result;
int result = ERROR_OK;
struct kinetis_flash_bank *kinfo = bank->driver_priv;
uint8_t *buffer_aligned = NULL;
/*

6
src/flash/nor/niietcm4.c
View File

@ -230,7 +230,8 @@ static int niietcm4_uopstatus_check(struct flash_bank *bank)
static int niietcm4_dump_uflash_page(struct flash_bank *bank, uint32_t *dump, int page_num, int mem_type)
{
struct target *target = bank->target;
int i, retval;
int i;
int retval = ERROR_OK;
uint32_t uflash_cmd;
if (mem_type == INFO_MEM_TYPE)
@ -265,7 +266,8 @@ static int niietcm4_dump_uflash_page(struct flash_bank *bank, uint32_t *dump, in
static int niietcm4_load_uflash_page(struct flash_bank *bank, uint32_t *dump, int page_num, int mem_type)
{
struct target *target = bank->target;
int i, retval;
int i;
int retval = ERROR_OK;
uint32_t uflash_cmd;
if (mem_type == INFO_MEM_TYPE)

8
src/flash/nor/xmc4xxx.c
View File

@ -1091,11 +1091,6 @@ static int xmc4xxx_flash_unprotect(struct flash_bank *bank, int32_t level)
uint32_t addr;
int res;
if ((level < 0) || (level > 1)) {
LOG_ERROR("Invalid user level. Must be 0-1");
return ERROR_FAIL;
}
switch (level) {
case 0:
addr = UCB0_BASE;
@ -1103,6 +1098,9 @@ static int xmc4xxx_flash_unprotect(struct flash_bank *bank, int32_t level)
case 1:
addr = UCB1_BASE;
break;
default:
LOG_ERROR("Invalid user level. Must be 0-1");
return ERROR_FAIL;
}
res = xmc4xxx_erase_sector(bank, addr, true);

2
src/target/xscale.c
View File

@ -2667,7 +2667,7 @@ static int xscale_analyze_trace(struct target *target, struct command_context *c
struct xscale_common *xscale = target_to_xscale(target);
struct xscale_trace_data *trace_data = xscale->trace.data;
int i, retval;
uint32_t breakpoint_pc;
uint32_t breakpoint_pc = 0;
struct arm_instruction instruction;
uint32_t current_pc = 0;/* initialized when address determined */