X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=b3d1aa755855956b8e552a801a7c3b40283829ad;hp=390e37ad58eb5197668fd7b96a7958b08fd6abff;hb=d47e1b8f362379d8a2307f49e2b42115a3f40524;hpb=9e6cec0dd3301395345777cfe2617559a868f2a9 diff --git a/src/flash/flash.c b/src/flash/flash.c index 390e37ad58..b3d1aa7558 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -43,13 +43,15 @@ int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, cha int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr); /* flash drivers */ @@ -61,6 +63,8 @@ extern flash_driver_t str9x_flash; extern flash_driver_t stellaris_flash; extern flash_driver_t str9xpec_flash; extern flash_driver_t stm32x_flash; +extern flash_driver_t tms470_flash; +extern flash_driver_t ecosflash_flash; flash_driver_t *flash_drivers[] = { @@ -72,6 +76,8 @@ flash_driver_t *flash_drivers[] = &stellaris_flash, &str9xpec_flash, &stm32x_flash, + &tms470_flash, + &ecosflash_flash, NULL, }; @@ -79,16 +85,58 @@ flash_bank_t *flash_banks; static command_t *flash_cmd; static int auto_erase = 0; +/* wafer thin wrapper for invoking the flash driver */ +static int flash_driver_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +{ + int retval; + + retval=bank->driver->write(bank, buffer, offset, count); + if (retval!=ERROR_OK) + { + LOG_ERROR("error writing to flash at address 0x%08x at offset 0x%8.8x (%d)", bank->base, offset, retval); + } + + return retval; +} + +static int flash_driver_erase(struct flash_bank_s *bank, int first, int last) +{ + int retval; + + retval=bank->driver->erase(bank, first, last); + if (retval!=ERROR_OK) + { + LOG_ERROR("failed erasing sectors %d to %d (%d)", first, last, retval); + } + + return retval; +} + +int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last) +{ + int retval; + + retval=bank->driver->protect(bank, set, first, last); + if (retval!=ERROR_OK) + { + LOG_ERROR("failed setting protection for areas %d to %d (%d)", first, last, retval); + } + + return retval; +} + + int flash_register_commands(struct command_context_s *cmd_ctx) { flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL); - - register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, NULL); - + + register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash_bank [driver_options ...]"); + register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_ANY, + "auto erase flash sectors "); return ERROR_OK; } -int flash_init(struct command_context_s *cmd_ctx) +int flash_init_drivers(struct command_context_s *cmd_ctx) { if (flash_banks) { @@ -102,24 +150,22 @@ int flash_init(struct command_context_s *cmd_ctx) "check erase state of sectors in flash bank "); register_command(cmd_ctx, flash_cmd, "protect_check", handle_flash_protect_check_command, COMMAND_EXEC, "check protection state of sectors in flash bank "); - register_command(cmd_ctx, flash_cmd, "erase", handle_flash_erase_command, COMMAND_EXEC, + register_command(cmd_ctx, flash_cmd, "erase_sector", handle_flash_erase_command, COMMAND_EXEC, "erase sectors at "); - register_command(cmd_ctx, flash_cmd, "write", handle_flash_write_binary_command, COMMAND_EXEC, - "DEPRECATED, use 'write_binary' or 'write_image' instead"); - register_command(cmd_ctx, flash_cmd, "write_binary", handle_flash_write_binary_command, COMMAND_EXEC, - "write binary "); + register_command(cmd_ctx, flash_cmd, "erase_address", handle_flash_erase_address_command, COMMAND_EXEC, + "erase address range
"); + register_command(cmd_ctx, flash_cmd, "write_bank", handle_flash_write_bank_command, COMMAND_EXEC, + "write binary data to "); register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC, - "write image [offset] [type]"); + "write_image [offset] [type]"); register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC, "set protection of sectors at "); - register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_EXEC, - "auto erase flash sectors "); } - + return ERROR_OK; } -flash_bank_t *get_flash_bank_by_num(int num) +flash_bank_t *get_flash_bank_by_num_noprobe(int num) { flash_bank_t *p; int i = 0; @@ -131,44 +177,69 @@ flash_bank_t *get_flash_bank_by_num(int num) return p; } } - + LOG_ERROR("flash bank %d does not exist", num); return NULL; } -/* flash_bank [driver_options ...] - */ +int flash_get_bank_count() +{ + flash_bank_t *p; + int i = 0; + for (p = flash_banks; p; p = p->next) + { + i++; + } + return i; +} + +flash_bank_t *get_flash_bank_by_num(int num) +{ + flash_bank_t *p = get_flash_bank_by_num_noprobe(num); + int retval; + + if (p == NULL) + return NULL; + + retval = p->driver->auto_probe(p); + + if (retval != ERROR_OK) + { + LOG_ERROR("auto_probe failed %d\n", retval); + return NULL; + } + return p; +} + int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { int i; int found = 0; target_t *target; - + if (argc < 6) { - WARNING("incomplete flash_bank configuration"); - WARNING("flash_bank [driver_options ...]"); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL) { - ERROR("target %lu not defined", strtoul(args[5], NULL, 0)); + LOG_ERROR("target %lu not defined", strtoul(args[5], NULL, 0)); return ERROR_OK; } - + for (i = 0; flash_drivers[i]; i++) { if (strcmp(args[0], flash_drivers[i]->name) == 0) { flash_bank_t *p, *c; - + /* register flash specific commands */ if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) { - ERROR("couldn't register '%s' commands", args[0]); + LOG_ERROR("couldn't register '%s' commands", args[0]); exit(-1); } - + c = malloc(sizeof(flash_bank_t)); c->target = target; c->driver = flash_drivers[i]; @@ -177,15 +248,17 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->size = strtoul(args[2], NULL, 0); c->chip_width = strtoul(args[3], NULL, 0); c->bus_width = strtoul(args[4], NULL, 0); + c->num_sectors = 0; + c->sectors = NULL; c->next = NULL; - + if (flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK) { - ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base); + LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base); free(c); return ERROR_OK; } - + /* put flash bank in linked list */ if (flash_banks) { @@ -198,18 +271,18 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char { flash_banks = c; } - + found = 1; } } - + /* no matching flash driver found */ if (!found) { - ERROR("flash driver '%s' not found", args[0]); + LOG_ERROR("flash driver '%s' not found", args[0]); exit(-1); } - + return ERROR_OK; } @@ -217,19 +290,19 @@ int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, cha { flash_bank_t *p; int i = 0; - + if (!flash_banks) { command_print(cmd_ctx, "no flash banks configured"); return ERROR_OK; } - + for (p = flash_banks; p; p = p->next) { command_print(cmd_ctx, "#%i: %s at 0x%8.8x, size 0x%8.8x, buswidth %i, chipwidth %i", i++, p->driver->name, p->base, p->size, p->bus_width, p->chip_width); } - + return ERROR_OK; } @@ -238,32 +311,35 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char flash_bank_t *p; int i = 0; int j = 0; - + int retval; + if (argc != 1) { - command_print(cmd_ctx, "usage: flash info "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + for (p = flash_banks; p; p = p->next, i++) { if (i == strtoul(args[0], NULL, 0)) { char buf[1024]; - + + /* attempt auto probe */ + p->driver->auto_probe(p); + command_print(cmd_ctx, "#%i: %s at 0x%8.8x, size 0x%8.8x, buswidth %i, chipwidth %i", i, p->driver->name, p->base, p->size, p->bus_width, p->chip_width); for (j = 0; j < p->num_sectors; j++) { char *erase_state, *protect_state; - + if (p->sectors[j].is_erased == 0) erase_state = "not erased"; else if (p->sectors[j].is_erased == 1) erase_state = "erased"; else erase_state = "erase state unknown"; - + if (p->sectors[j].is_protected == 0) protect_state = "not protected"; else if (p->sectors[j].is_protected == 1) @@ -275,12 +351,15 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, erase_state, protect_state); } - - p->driver->info(p, buf, 1024); + + *buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */ + retval = p->driver->info(p, buf, sizeof(buf)); command_print(cmd_ctx, "%s", buf); + if (retval != ERROR_OK) + LOG_ERROR("error retrieving flash info (%d)", retval); } } - + return ERROR_OK; } @@ -288,14 +367,13 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha { flash_bank_t *p; int retval; - + if (argc != 1) { - command_print(cmd_ctx, "usage: flash probe "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); + + p = get_flash_bank_by_num_noprobe(strtoul(args[0], NULL, 0)); if (p) { if ((retval = p->driver->probe(p)) == ERROR_OK) @@ -317,7 +395,7 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha { command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); } - + return ERROR_OK; } @@ -325,13 +403,12 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm { flash_bank_t *p; int retval; - + if (argc != 1) { - command_print(cmd_ctx, "usage: flash erase_check "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); if (p) { @@ -345,25 +422,65 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm args[0], p->base); } } - else + + return ERROR_OK; +} + +int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + flash_bank_t *p; + int retval; + int address; + int length; + duration_t duration; + char *duration_text; + + target_t *target = get_current_target(cmd_ctx); + + if (argc != 2) { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); + return ERROR_COMMAND_SYNTAX_ERROR; } - - return ERROR_OK; + + address = strtoul(args[0], NULL, 0); + length = strtoul(args[1], NULL, 0); + if (length <= 0) + { + command_print(cmd_ctx, "Length must be >0"); + return ERROR_COMMAND_SYNTAX_ERROR; + } + + p = get_flash_bank_by_addr(target, address); + if (p == NULL) + { + return ERROR_COMMAND_SYNTAX_ERROR; + } + + /* We can't know if we did a resume + halt, in which case we no longer know the erased state */ + flash_set_dirty(); + + duration_start_measure(&duration); + + if ((retval = flash_erase_address_range(target, address, length)) == ERROR_OK) + { + duration_stop_measure(&duration, &duration_text); + command_print(cmd_ctx, "erased address 0x%8.8x length %i in %s", address, length, duration_text); + free(duration_text); + } + + return retval; } int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *p; int retval; - + if (argc != 1) { - command_print(cmd_ctx, "usage: flash protect_check "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); if (p) { @@ -382,9 +499,9 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char * } else { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); + return ERROR_COMMAND_SYNTAX_ERROR; } - + return ERROR_OK; } @@ -398,52 +515,25 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha flash_bank_t *p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); duration_t duration; char *duration_text; - + duration_start_measure(&duration); - + if (!p) { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } - - if ((retval = p->driver->erase(p, first, last)) != ERROR_OK) - { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - command_print(cmd_ctx, "can't work with this flash while target is running"); - break; - case ERROR_INVALID_ARGUMENTS: - command_print(cmd_ctx, "usage: flash_erase "); - break; - case ERROR_FLASH_BANK_INVALID: - command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); - break; - case ERROR_FLASH_OPERATION_FAILED: - command_print(cmd_ctx, "flash erase error"); - break; - case ERROR_FLASH_SECTOR_INVALID: - command_print(cmd_ctx, "sector number(s) invalid"); - break; - case ERROR_OK: - command_print(cmd_ctx, "erased flash sectors %i to %i", first, last); - break; - default: - command_print(cmd_ctx, "unknown error"); - } + return ERROR_COMMAND_SYNTAX_ERROR; } - else + + if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK) { - duration_stop_measure(&duration, &duration_text); - + duration_stop_measure(&duration, &duration_text); + command_print(cmd_ctx, "erased sectors %i through %i on flash bank %i in %s", first, last, strtoul(args[0], 0, 0), duration_text); free(duration_text); } } else { - command_print(cmd_ctx, "usage: flash erase "); + return ERROR_COMMAND_SYNTAX_ERROR; } return ERROR_OK; @@ -463,51 +553,26 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); return ERROR_OK; } - + if (strcmp(args[3], "on") == 0) set = 1; else if (strcmp(args[3], "off") == 0) set = 0; else { - command_print(cmd_ctx, "usage: flash protect "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - - if ((retval = p->driver->protect(p, set, first, last)) != ERROR_OK) - { - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - command_print(cmd_ctx, "can't work with this flash while target is running"); - break; - case ERROR_INVALID_ARGUMENTS: - command_print(cmd_ctx, "usage: flash protect "); - break; - case ERROR_FLASH_BANK_INVALID: - command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); - break; - case ERROR_FLASH_OPERATION_FAILED: - command_print(cmd_ctx, "flash program error"); - break; - case ERROR_FLASH_SECTOR_INVALID: - command_print(cmd_ctx, "sector number(s) invalid"); - break; - case ERROR_OK: - command_print(cmd_ctx, "protection of flash sectors %i to %i turned %s", first, last, args[3]); - break; - default: - command_print(cmd_ctx, "unknown error"); - } - } - else + + retval = flash_driver_protect(p, set, first, last); + if (retval == ERROR_OK) { command_print(cmd_ctx, "%s protection for sectors %i through %i on flash bank %i", (set) ? "set" : "cleared", first, last, strtoul(args[0], 0, 0)); } } else { - command_print(cmd_ctx, "usage: flash protect "); + return ERROR_COMMAND_SYNTAX_ERROR; + } return ERROR_OK; @@ -516,39 +581,29 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); - + image_t image; u32 written; - char *error_str; - int *failed; - - int i; - + duration_t duration; char *duration_text; - + int retval; - - if (!strcmp(cmd, "write")) - { - command_print(cmd_ctx, "'flash write' has been deprecated in favor of 'flash write_binary' and 'flash write_image'"); - DEBUG("'flash write' has been deprecated in favor of 'flash write_binary' and 'flash write_image'"); - } if (argc < 1) { - command_print(cmd_ctx, "usage: flash write [offset] [type]"); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; + } - + if (!target) { - ERROR("no target selected"); + LOG_ERROR("no target selected"); return ERROR_OK; } - + duration_start_measure(&duration); - + if (argc >= 2) { image.base_address_set = 1; @@ -559,76 +614,58 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm image.base_address_set = 0; image.base_address = 0x0; } - + image.start_address_set = 0; - if (image_open(&image, args[0], (argc == 4) ? args[2] : NULL) != ERROR_OK) + retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL); + if (retval != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", image.error_str); - return ERROR_OK; + return retval; } - - failed = malloc(sizeof(int) * image.num_sections); - error_str=NULL; - retval = flash_write(target, &image, &written, &error_str, failed, auto_erase); - + retval = flash_write(target, &image, &written, auto_erase); + if (retval != ERROR_OK) { - if (error_str) - { - command_print(cmd_ctx, "failed writing image %s: %s", args[0], error_str); - free(error_str); - } image_close(&image); - free(failed); return retval; } - - for (i = 0; i < image.num_sections; i++) - { - if (failed[i]) - { - command_print(cmd_ctx, "didn't write section at 0x%8.8x, size 0x%8.8x", - image.sections[i].base_address, image.sections[i].size); - } - } - + duration_stop_measure(&duration, &duration_text); + if (retval == ERROR_OK) + { command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)", written, args[0], duration_text, (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); - + } free(duration_text); - free(failed); image_close(&image); - - return ERROR_OK; + + return retval; } -int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { u32 offset; u8 *buffer; u32 buf_cnt; fileio_t fileio; - + duration_t duration; char *duration_text; - + int retval; flash_bank_t *p; - if (argc < 3) + if (argc != 3) { - command_print(cmd_ctx, "usage: flash write "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + duration_start_measure(&duration); - + offset = strtoul(args[2], NULL, 0); p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); if (!p) @@ -636,63 +673,49 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); return ERROR_OK; } - + if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", fileio.error_str); return ERROR_OK; } - + buffer = malloc(fileio.size); if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", fileio.error_str); return ERROR_OK; } - - if ((retval = p->driver->write(p, buffer, offset, buf_cnt)) != ERROR_OK) - { - command_print(cmd_ctx, "failed writing file %s to flash bank %i at offset 0x%8.8x", - args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0)); - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - command_print(cmd_ctx, "can't work with this flash while target is running"); - break; - case ERROR_INVALID_ARGUMENTS: - command_print(cmd_ctx, "usage: flash write "); - break; - case ERROR_FLASH_BANK_INVALID: - command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); - break; - case ERROR_FLASH_OPERATION_FAILED: - command_print(cmd_ctx, "flash program error"); - break; - case ERROR_FLASH_DST_BREAKS_ALIGNMENT: - command_print(cmd_ctx, "offset breaks required alignment"); - break; - case ERROR_FLASH_DST_OUT_OF_BANK: - command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)"); - break; - case ERROR_FLASH_SECTOR_NOT_ERASED: - command_print(cmd_ctx, "destination sector(s) not erased"); - break; - default: - command_print(cmd_ctx, "unknown error"); - } - } + + retval = flash_driver_write(p, buffer, offset, buf_cnt); free(buffer); - + duration_stop_measure(&duration, &duration_text); + if (retval!=ERROR_OK) + { command_print(cmd_ctx, "wrote %"PRIi64" byte from file %s to flash bank %i at offset 0x%8.8x in %s (%f kb/s)", fileio.size, args[1], strtoul(args[0], NULL, 0), offset, duration_text, (float)fileio.size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); + } free(duration_text); fileio_close(&fileio); - - return ERROR_OK; + + return retval; +} + +void flash_set_dirty(void) +{ + flash_bank_t *c; + int i; + + /* set all flash to require erasing */ + for (c = flash_banks; c; c = c->next) + { + for (i = 0; i < c->num_sectors; i++) + { + c->sectors[i].is_erased = 0; + } + } } /* lookup flash bank by address */ @@ -703,45 +726,53 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) /* cycle through bank list */ for (c = flash_banks; c; c = c->next) { + int retval; + retval = c->driver->auto_probe(c); + + if (retval != ERROR_OK) + { + LOG_ERROR("auto_probe failed %d\n", retval); + return NULL; + } /* check whether address belongs to this flash bank */ if ((addr >= c->base) && (addr < c->base + c->size) && target == c->target) return c; } - + LOG_ERROR("No flash at address 0x%08x\n", addr); return NULL; } /* erase given flash region, selects proper bank according to target and address */ -int flash_erase(target_t *target, u32 addr, u32 length) +int flash_erase_address_range(target_t *target, u32 addr, u32 length) { flash_bank_t *c; int first = -1; int last = -1; int i; - + if ((c = get_flash_bank_by_addr(target, addr)) == NULL) return ERROR_FLASH_DST_OUT_OF_BANK; /* no corresponding bank found */ if (c->size == 0 || c->num_sectors == 0) return ERROR_FLASH_BANK_INVALID; - + if (length == 0) { /* special case, erase whole bank when length is zero */ if (addr != c->base) return ERROR_FLASH_DST_BREAKS_ALIGNMENT; - - return c->driver->erase(c, 0, c->num_sectors - 1); + + return flash_driver_erase(c, 0, c->num_sectors - 1); } /* check whether it fits */ if (addr + length > c->base + c->size) return ERROR_FLASH_DST_BREAKS_ALIGNMENT; - + addr -= c->base; - + for (i = 0; i < c->num_sectors; i++) - { + { /* check whether sector overlaps with the given range and is not yet erased */ if (addr < c->sectors[i].offset + c->sectors[i].size && addr + length > c->sectors[i].offset && c->sectors[i].is_erased != 1) { /* if first is not set yet then this is the first sector */ @@ -750,46 +781,49 @@ int flash_erase(target_t *target, u32 addr, u32 length) last = i; /* and it is the last one so far in any case */ } } - + if( first == -1 || last == -1 ) return ERROR_OK; - - return c->driver->erase(c, first, last); + + return flash_driver_erase(c, first, last); } -/* write an image to flash memory of the given target */ -int flash_write(target_t *target, image_t *image, u32 *written, char **error_str, int *failed, int erase) +/* write (optional verify) an image to flash memory of the given target */ +int flash_write(target_t *target, image_t *image, u32 *written, int erase) { int retval; - int i; int section; u32 section_offset; + flash_bank_t *c; section = 0; section_offset = 0; if (written) *written = 0; - - if (failed != NULL) - for (i = 0; i < image->num_sections; i++) - failed[i] = 0; + + if (erase) + { + /* assume all sectors need erasing - stops any problems + * when flash_write is called multiple times */ + + flash_set_dirty(); + } /* loop until we reach end of the image */ while (section < image->num_sections) { - flash_bank_t *c; u32 buffer_size; u8 *buffer; int section_first; int section_last; - u32 run_address = image->sections[section].base_address+section_offset; - u32 run_size = image->sections[section].size-section_offset; + u32 run_address = image->sections[section].base_address + section_offset; + u32 run_size = image->sections[section].size - section_offset; if (image->sections[section].size == 0) { - WARNING("empty section %d", section); + LOG_WARNING("empty section %d", section); section++; section_offset = 0; continue; @@ -798,15 +832,6 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str /* find the corresponding flash bank */ if ((c = get_flash_bank_by_addr(target, run_address)) == NULL) { - if (failed == NULL) - { - if (error_str == NULL) - return ERROR_FLASH_DST_OUT_OF_BANK; /* abort operation */ - *error_str = malloc(FLASH_MAX_ERROR_STR); - snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address"); - return ERROR_FLASH_DST_OUT_OF_BANK; /* abort operation */ - } - failed[section] = ERROR_FLASH_DST_OUT_OF_BANK; /* mark the section as failed */ section++; /* and skip it */ section_offset = 0; continue; @@ -820,7 +845,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str { if (image->sections[section_last + 1].base_address < (run_address + run_size)) { - WARNING("section %d out of order", section_last + 1); + LOG_DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1); break; } if (image->sections[section_last + 1].base_address != (run_address + run_size)) @@ -840,29 +865,18 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str while (buffer_size < run_size) { u32 size_read; - + if (buffer_size - run_size <= image->sections[section].size - section_offset) size_read = buffer_size - run_size; else size_read = image->sections[section].size - section_offset; - + if ((retval = image_read_section(image, section, section_offset, - run_size, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0) + size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0) { free(buffer); - - if (error_str == NULL) - return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE; - - *error_str = malloc(FLASH_MAX_ERROR_STR); - - /* if image_read_section returned an error there's an error string we can pass on */ - if (retval != ERROR_OK) - snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image: %s", image->error_str); - else - snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image"); - - return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE; + + return retval; } buffer_size += size_read; @@ -876,54 +890,26 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str } retval = ERROR_OK; - + if (erase) { /* calculate and erase sectors */ - retval = flash_erase( target, run_address, run_size ); + retval = flash_erase_address_range( target, run_address, run_size ); } - + if (retval == ERROR_OK) { /* write flash sectors */ - retval = c->driver->write(c, buffer, run_address - c->base, run_size); + retval = flash_driver_write(c, buffer, run_address - c->base, run_size); } - + free(buffer); if (retval != ERROR_OK) { - if (error_str == NULL) return retval; /* abort operation */ - - *error_str = malloc(FLASH_MAX_ERROR_STR); - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "can't flash image while target is running"); - break; - case ERROR_INVALID_ARGUMENTS: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash driver can't fulfill request"); - break; - case ERROR_FLASH_OPERATION_FAILED: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash program error"); - break; - case ERROR_FLASH_DST_BREAKS_ALIGNMENT: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "offset breaks required alignment"); - break; - case ERROR_FLASH_DST_OUT_OF_BANK: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address"); - break; - case ERROR_FLASH_SECTOR_NOT_ERASED: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "destination sector(s) not erased"); - break; - default: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "unknown error: %i", retval); } - return retval; /* abort operation */ - } - if (written != NULL) *written += run_size; /* add run size to total written counter */ } @@ -935,16 +921,15 @@ int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd { if (argc != 1) { - command_print(cmd_ctx, "usage: flash auto_erase "); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + if (strcmp(args[0], "on") == 0) auto_erase = 1; else if (strcmp(args[0], "off") == 0) auto_erase = 0; - + else + return ERROR_COMMAND_SYNTAX_ERROR; + return ERROR_OK; } - -