diff options
| -rw-r--r-- | src/flash/nor/kinetis.c | 2 | ||||
| -rw-r--r-- | src/flash/nor/niietcm4.c | 6 | ||||
| -rw-r--r-- | src/flash/nor/xmc4xxx.c | 8 | ||||
| -rw-r--r-- | src/target/xscale.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c index 0b738e2..2e34bcb 100644 --- a/src/flash/nor/kinetis.c +++ b/src/flash/nor/kinetis.c @@ -1340,7 +1340,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; /* diff --git a/src/flash/nor/niietcm4.c b/src/flash/nor/niietcm4.c index 9238222..4a849fd 100644 --- a/src/flash/nor/niietcm4.c +++ b/src/flash/nor/niietcm4.c @@ -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) diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c index f396ca3..b761951 100644 --- a/src/flash/nor/xmc4xxx.c +++ b/src/flash/nor/xmc4xxx.c @@ -998,11 +998,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; @@ -1010,6 +1005,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); diff --git a/src/target/xscale.c b/src/target/xscale.c index 3d5abdf..140ea58 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -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 */ |