X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=f1710851cfd642f7493f8d234fb8ef72f4c813ca;hb=d17e1cd93384d56886be7e67cf2b31e97118d811;hp=83b6fc3703a956bc5ee5ca99f927efeab58045e0;hpb=ed36a8d15dfd04e47d23d5f1e09078f105785fb1;p=fw%2Fopenocd diff --git a/src/flash/flash.c b/src/flash/flash.c index 83b6fc370..f1710851c 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -43,12 +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 */ @@ -60,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[] = { @@ -71,22 +76,90 @@ flash_driver_t *flash_drivers[] = &stellaris_flash, &str9xpec_flash, &stm32x_flash, + &tms470_flash, + &ecosflash_flash, NULL, }; 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=ERROR_OK; + if (bank->target->state != TARGET_HALTED) + { + ERROR("target not halted - aborting flash write"); + retval=ERROR_TARGET_NOT_HALTED; + } else + { + retval=bank->driver->write(bank, buffer, offset, count); + } + if (retval!=ERROR_OK) + { + ERROR("Writing to flash bank at address 0x%08x at offset 0x%8.8x", bank->base, offset); + } + return retval; +} + +static int flash_driver_erase(struct flash_bank_s *bank, int first, int last) +{ + int retval=ERROR_OK; + if (bank->target->state != TARGET_HALTED) + { + ERROR("target not halted - aborting flash erase"); + retval=ERROR_TARGET_NOT_HALTED; + } else if ((first < 0) || (last < first) || (last >= bank->num_sectors)) + { + ERROR("invalid flash sector"); + retval=ERROR_FLASH_SECTOR_INVALID; + } else + { + retval=bank->driver->erase(bank, first, last); + } + if (retval!=ERROR_OK) + { + ERROR("Failed erasing banks %d to %d", first, last); + } + return retval; +} + +int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last) +{ + int retval; + if (bank->target->state != TARGET_HALTED) + { + ERROR("target not halted - aborting flash erase"); + retval=ERROR_TARGET_NOT_HALTED; + } else if ((first < 0) || (last < first) || (last >= bank->num_sectors)) + { + ERROR("invalid flash sector"); + retval=ERROR_FLASH_SECTOR_INVALID; + } else + { + retval=bank->driver->protect(bank, set, first, last); + } + if (retval!=ERROR_OK) + { + ERROR("Failed protecting banks %d to %d", first, last); + } + 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) { @@ -100,14 +173,14 @@ 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 "); } @@ -115,7 +188,7 @@ int flash_init(struct command_context_s *cmd_ctx) 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; @@ -127,12 +200,28 @@ flash_bank_t *get_flash_bank_by_num(int num) return p; } } - + ERROR("Flash bank %d does not exist", num); return NULL; } -/* flash_bank [driver_options ...] - */ +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) + { + 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; @@ -141,9 +230,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char 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) @@ -173,6 +260,8 @@ 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) @@ -237,8 +326,7 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char 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++) @@ -247,6 +335,9 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char { 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++) @@ -287,11 +378,10 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha 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) @@ -324,8 +414,7 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm 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)); @@ -341,12 +430,53 @@ 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) @@ -356,8 +486,7 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char * 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)); @@ -378,7 +507,7 @@ 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; @@ -399,37 +528,10 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha if (!p) { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - 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"); - } - } - else + if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK) { duration_stop_measure(&duration, &duration_text); @@ -439,7 +541,7 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha } else { - command_print(cmd_ctx, "usage: flash erase "); + return ERROR_COMMAND_SYNTAX_ERROR; } return ERROR_OK; @@ -466,44 +568,19 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c 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; @@ -515,26 +592,16 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm 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) @@ -558,41 +625,36 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm 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; + command_print(cmd_ctx, "image_open error: %s", image.error_str); + return retval; } - failed = malloc(sizeof(int) * image.num_sections); + retval = flash_write(target, &image, &written, auto_erase); - if ((retval = flash_write(target, &image, &written, &error_str, failed)) != ERROR_OK) - { - command_print(cmd_ctx, "failed writing image %s: %s", args[0], error_str); - free(error_str); - } - - for (i = 0; i < image.num_sections; i++) + if (retval != ERROR_OK) { - 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); - } + image_close(&image); + return retval; } 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); 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; @@ -606,10 +668,9 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c 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); @@ -624,60 +685,48 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", fileio.error_str); + command_print(cmd_ctx, "flash write_binary 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); + command_print(cmd_ctx, "flash write_binary 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 */ @@ -688,83 +737,100 @@ 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) + { + 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; } - + 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; - unsigned long sector_size; - int first; - int last; - + 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 */ - - /* sanity checks */ - if (c->size == 0 || c->num_sectors == 0 || c->size % c->num_sectors) - return ERROR_FLASH_BANK_INVALID; + 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; - - /* calculate sector size */ - sector_size = c->size / c->num_sectors; - - /* check alignment */ - if ((addr - c->base) % sector_size || length % sector_size) return ERROR_FLASH_DST_BREAKS_ALIGNMENT; - - first = (addr - c->base) / sector_size; - last = first + length / sector_size - 1; - return c->driver->erase(c, first, last); + + 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 */ + if (first == -1) + first = i; + last = i; /* and it is the last one so far in any case */ + } + } + + if( first == -1 || last == -1 ) + return ERROR_OK; + + 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) +/* 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) { @@ -777,15 +843,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; @@ -799,7 +856,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); + 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)) @@ -830,18 +887,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str { 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; @@ -854,45 +900,48 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str } } - retval = c->driver->write(c, buffer, run_address - c->base, run_size); + retval = ERROR_OK; + + if (erase) + { + /* calculate and erase sectors */ + retval = flash_erase_address_range( target, run_address, run_size ); + } + + if (retval == ERROR_OK) + { + /* write flash sectors */ + 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 */ } return ERROR_OK; } + +int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc != 1) + { + 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; +}