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
*/
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;\r
flash_driver_t *flash_drivers[] =
{
&stellaris_flash,
&str9xpec_flash,
&stm32x_flash,
+ &tms470_flash,
+ &ecosflash_flash,\r
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> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
+ register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_ANY,
+ "auto erase flash sectors <on|off>");
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)
{
"check erase state of sectors in flash bank <num>");
register_command(cmd_ctx, flash_cmd, "protect_check", handle_flash_protect_check_command, COMMAND_EXEC,
"check protection state of sectors in flash bank <num>");
- 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 <bank> <first> <last>");
- 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 <bank> <file> <offset>");
+ register_command(cmd_ctx, flash_cmd, "erase_address", handle_flash_erase_address_command, COMMAND_EXEC,
+ "erase address range <address> <length>");
+ register_command(cmd_ctx, flash_cmd, "write_bank", handle_flash_write_bank_command, COMMAND_EXEC,
+ "write binary data to <bank> <file> <offset>");
register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC,
- "write image <file> [offset] [type]");
+ "write_image <file> [offset] [type]");
register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC,
"set protection of sectors at <bank> <first> <last> <on|off>");
}
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;
return p;
}
}
-
+ ERROR("Flash bank %d does not exist", num);
return NULL;
}
-/* flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [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;
if (argc < 6)
{
- WARNING("incomplete flash_bank configuration");
- WARNING("flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL)
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)
if (argc != 1)
{
- command_print(cmd_ctx, "usage: flash info <num>");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
for (p = flash_banks; p; p = p->next, i++)
{
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++)
else
protect_state = "protection state unknown";
- command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%xkB) %s, %s",
- j, p->sectors[j].offset, p->sectors[j].size,
+ command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s, %s",
+ j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
erase_state, protect_state);
}
if (argc != 1)
{
- command_print(cmd_ctx, "usage: flash probe <num>");
- 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)
if (argc != 1)
{
- command_print(cmd_ctx, "usage: flash erase_check <num>");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
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)
if (argc != 1)
{
- command_print(cmd_ctx, "usage: flash protect_check <num>");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
}
else
{
- command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
return ERROR_OK;
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 <bank> <first> <last>");
- 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);
}
else
{
- command_print(cmd_ctx, "usage: flash erase <bank> <first> <last>");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
return ERROR_OK;
set = 0;
else
{
- command_print(cmd_ctx, "usage: flash protect <bank> <first> <last> <on|off>");
- 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 <bank> <first> <last> <on|off>");
- 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 <bank> <first> <last> <on|off>");
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
}
return ERROR_OK;
target_t *target = get_current_target(cmd_ctx);
image_t image;
- u32 image_size;
- char *error_str;
- u32 *failed;
-
- int i;
+ u32 written;
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 <file> [offset] [type]");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
}
if (!target)
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(u32) * image.num_sections);
+ retval = flash_write(target, &image, &written, auto_erase);
- if ((retval = flash_write(target, &image, &image_size, &error_str, failed)) != ERROR_OK)
+ if (retval != 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 (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)",
- image_size, args[0], duration_text,
- (float)image_size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
+ 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;
int retval;
flash_bank_t *p;
- if (argc < 3)
+ if (argc != 3)
{
- command_print(cmd_ctx, "usage: flash write <bank> <file> <offset>");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
duration_start_measure(&duration);
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 <bank> <file> <offset>");
- 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 */
/* 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);
}
-int flash_write(target_t *target, image_t *image, u32 *image_size, char **error_str, u32 *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 last_section;
- int section;
- int next_section;
int retval;
+
+ int section;
+ u32 section_offset;
+ flash_bank_t *c;
- *image_size = 0;
-
- /* for each section in the image */
- last_section = 0;
section = 0;
- while (section < image->num_sections)
+ section_offset = 0;
+
+ if (written)
+ *written = 0;
+
+ if (erase)
{
- u32 offset = 0;
- u32 address = image->sections[section].base_address;
- u32 size = image->sections[section].size;
+ /* assume all sectors need erasing - stops any problems
+ * when flash_write is called multiple times */
- /* collect consecutive sections */
- next_section = section + 1;
- while ((next_section < image->num_sections)
- && (image->sections[next_section].base_address == (address + size)))
+ flash_set_dirty();
+ }
+
+ /* loop until we reach end of the image */
+ while (section < image->num_sections)
+ {
+ 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;
+
+ if (image->sections[section].size == 0)
{
- size += image->sections[next_section].size;
- next_section++;
+ WARNING("empty section %d", section);
+ section++;
+ section_offset = 0;
+ continue;
}
-
- while (size != 0)
+
+ /* find the corresponding flash bank */
+ if ((c = get_flash_bank_by_addr(target, run_address)) == NULL)
{
- flash_bank_t *c;
- u32 thisrun_size = size;
- u32 buffer_size;
- u32 size_read;
- u8 *buffer;
-
- /* find the corresponding flash bank */
- if ((c = get_flash_bank_by_addr(target, address)) == NULL)
+ section++; /* and skip it */
+ section_offset = 0;
+ continue;
+ }
+
+ /* collect consecutive sections which fall into the same bank */
+ section_first = section;
+ section_last = section;
+ while ((run_address + run_size < c->base + c->size)
+ && (section_last + 1 < image->num_sections))
+ {
+ if (image->sections[section_last + 1].base_address < (run_address + run_size))
{
- /* mark as failed, and skip the current section */
- failed[section] = 1;
+ DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1);
break;
}
-
- /* check whether cumulated sections fit the bank, split into multiple runs if not */
- if ((address + size) > (c->base + c->size))
- thisrun_size = c->base + c->size - address;
+ if (image->sections[section_last + 1].base_address != (run_address + run_size))
+ break;
+ run_size += image->sections[++section_last].size;
+ }
- buffer = malloc(thisrun_size);
- buffer_size = 0;
+ /* fit the run into bank constraints */
+ if (run_address + run_size > c->base + c->size)
+ run_size = c->base + c->size - run_address;
+
+ /* allocate buffer */
+ buffer = malloc(run_size);
+ buffer_size = 0;
+
+ /* read sections to the buffer */
+ while (buffer_size < run_size)
+ {
+ u32 size_read;
- while (buffer_size < thisrun_size)
- {
- u32 thissection_size = image->sections[section].size - offset;
-
- if ((retval = image_read_section(image, section, offset,
- MIN(thisrun_size, thissection_size),
- buffer + buffer_size, &size_read)) != ERROR_OK)
- {
- *error_str = malloc(FLASH_MAX_ERROR_STR);
- snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image");
- return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE;
- }
-
- /* see if we're done with the current section */
- if (thissection_size < thisrun_size)
- {
- /* start with the next section */
- offset = 0;
- failed[section] = 0;
- section++;
- }
- else
- {
- /* continue inside the current section */
- offset += size_read;
- }
-
- buffer_size += 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 = c->driver->write(c, buffer, address - c->base, thisrun_size)) != ERROR_OK)
+ if ((retval = image_read_section(image, section, section_offset,
+ size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
{
- int i;
- /* mark sections as failed */
- for (i = last_section; i <= section; i++)
- failed[i] = 1;
-
- *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);
- }
-
free(buffer);
- /* abort operation */
return retval;
}
-
- free(buffer);
-
- address += thisrun_size;
- size -= thisrun_size;
- *image_size += thisrun_size;
- last_section = section;
+
+ buffer_size += size_read;
+ section_offset += size_read;
+
+ if (section_offset >= image->sections[section].size)
+ {
+ section++;
+ section_offset = 0;
+ }
+ }
+
+ 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)
+ {
+ 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;
}
Code Review / openocd.git / blobdiff