#include "fileio.h"
#include "image.h"
#include "log.h"
+#include "armv4_5.h"
+#include "algorithm.h"
+#include "binarybuffer.h"
+#include "armv7m.h"
#include <string.h>
#include <unistd.h>
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_fill_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;
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;
+
+ 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> <base> <size> <chip_width> <bus_width> <target> [driver_options ...]");
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,
- "DEPRECATED, use 'erase_sector' instead");
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, "erase_address", handle_flash_erase_address_command, COMMAND_EXEC,
"erase address range <address> <length>");
- register_command(cmd_ctx, flash_cmd, "write", handle_flash_write_binary_command, COMMAND_EXEC,
- "DEPRECATED, use 'write_binary' 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, "fillw", handle_flash_fill_command, COMMAND_EXEC,
+ "fill with pattern <address> <word_pattern> <count>");
+ register_command(cmd_ctx, flash_cmd, "fillh", handle_flash_fill_command, COMMAND_EXEC,
+ "fill with pattern <address> <halfword_pattern> <count>");
+ register_command(cmd_ctx, flash_cmd, "fillb", handle_flash_fill_command, COMMAND_EXEC,
+ "fill with pattern <address> <byte_pattern> <count>");
+
+ 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 [erase] <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>");
- register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_EXEC,
- "auto erase flash sectors <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;
}
}
-
+ LOG_ERROR("flash bank %d does not exist", num);
return NULL;
}
-/* flash_bank <driver> <base> <size> <chip_width> <bus_width> <target> [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> <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)
{
- 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];
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)
{
{
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;
}
{
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;
}
flash_bank_t *p;
int i = 0;
int j = 0;
-
+ int retval;
+
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++)
{
if (i == strtoul(args[0], NULL, 0))
{
char buf[1024];
-
+
+ /* attempt auto probe */
+ if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
+ return retval;
+
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";
-
+ char *protect_state;
+
if (p->sectors[j].is_protected == 0)
protect_state = "not protected";
else if (p->sectors[j].is_protected == 1)
else
protect_state = "protection state unknown";
- command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s, %s",
+ command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s",
j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
- erase_state, protect_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;
}
{
flash_bank_t *p;
int retval;
-
+
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)
{
command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
}
-
+
return ERROR_OK;
}
{
flash_bank_t *p;
int retval;
-
+
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));
if (p)
{
+ int j;
if ((retval = p->driver->erase_check(p)) == ERROR_OK)
{
command_print(cmd_ctx, "successfully checked erase state", p->driver->name, p->base);
command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x",
args[0], p->base);
}
+
+ for (j = 0; j < p->num_sectors; j++)
+ {
+ char *erase_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";
+
+ command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s",
+ j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
+ erase_state);
+ }
+
}
- else
- {
- command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
- }
-
+
return ERROR_OK;
}
int length;
duration_t duration;
char *duration_text;
-
+
target_t *target = get_current_target(cmd_ctx);
if (argc != 2)
{
- command_print(cmd_ctx, "usage: flash erase_address <address> <length>");
- return ERROR_OK;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
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_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
p = get_flash_bank_by_addr(target, address);
if (p == NULL)
{
- command_print(cmd_ctx, "No flash at that address");
- return ERROR_INVALID_ARGUMENTS;
+ 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(target, address, length)) != 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_address <address> <length>");
- 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;
- default:
- command_print(cmd_ctx, "unknown error");
- }
- }
- else
+
+ if ((retval = flash_erase_address_range(target, address, length)) == ERROR_OK)
{
- duration_stop_measure(&duration, &duration_text);
+ 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;
}
{
flash_bank_t *p;
int retval;
-
+
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));
if (p)
{
}
else
{
- command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
-
+
return ERROR_OK;
}
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 <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");
- }
+ 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 <bank> <first> <last>");
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
return ERROR_OK;
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 <bank> <first> <last> <on|off>");
- return ERROR_OK;
- }
-
- 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");
- }
+ return ERROR_COMMAND_SYNTAX_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;
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 (argc < 1)
{
- command_print(cmd_ctx, "usage: flash %s <file> [offset] [type]", cmd);
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
- if (!target)
+ /* flash auto-erase is disabled by default*/
+ int auto_erase = 0;
+
+ if (stricmp(args[0], "erase")==0)
{
- ERROR("no target selected");
- return ERROR_OK;
+ auto_erase = 1;
+ args++;
+ argc--;
+ command_print(cmd_ctx, "auto erase enabled");
}
- duration_start_measure(&duration);
+
+ if (argc < 1)
+ {
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+ if (!target)
+ {
+ LOG_ERROR("no target selected");
+ return ERROR_FAIL;
+ }
+
+ duration_start_measure(&duration);
+
if (argc >= 2)
{
image.base_address_set = 1;
image.base_address_set = 0;
image.base_address = 0x0;
}
-
+
image.start_address_set = 0;
retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
if (retval != ERROR_OK)
{
- command_print(cmd_ctx, "image_open error: %s", image.error_str);
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;
}
+
+ 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 retval;
+}
+
+int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ int err = ERROR_OK;
+ u32 address;
+ u32 pattern;
+ u32 count;
+ u8 chunk[1024];
+ u32 wrote = 0;
+ int chunk_count;
+ char *duration_text;
+ duration_t duration;
+ target_t *target = get_current_target(cmd_ctx);
+ u32 i;
+ int wordsize;
+
+ if (argc != 3)
+ {
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+
+ address = strtoul(args[0], NULL, 0);
+ pattern = strtoul(args[1], NULL, 0);
+ count = strtoul(args[2], NULL, 0);
+
+ if(count == 0)
+ return ERROR_OK;
+
+
+ switch(cmd[4])
+ {
+ case 'w':
+ wordsize=4;
+ break;
+ case 'h':
+ wordsize=2;
+ break;
+ case 'b':
+ wordsize=1;
+ break;
+ default:
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
- for (i = 0; i < image.num_sections; i++)
+ chunk_count = MIN(count, (1024 / wordsize));
+ switch(wordsize)
{
- if (failed[i])
+ case 4:
+ for(i = 0; i < chunk_count; 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);
+ target_buffer_set_u32(target, chunk + i * wordsize, pattern);
}
+ break;
+ case 2:
+ for(i = 0; i < chunk_count; i++)
+ {
+ target_buffer_set_u16(target, chunk + i * wordsize, pattern);
+ }
+ break;
+ case 1:
+ memset(chunk, pattern, chunk_count);
+ break;
+ default:
+ LOG_ERROR("BUG: can't happen");
+ exit(-1);
}
- duration_stop_measure(&duration, &duration_text);
- 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);
+ duration_start_measure(&duration);
- image_close(&image);
+ flash_set_dirty();
+ err = flash_erase_address_range( target, address, count*wordsize );
+ if (err == ERROR_OK)
+ {
+ for (wrote=0; wrote<(count*wordsize); wrote+=sizeof(chunk))
+ {
+ int cur_size = MIN( (count*wordsize - wrote) , 1024 );
+ if (err == ERROR_OK)
+ {
+ flash_bank_t *bank;
+ bank = get_flash_bank_by_addr(target, address);
+ if(bank == NULL)
+ {
+ err = ERROR_FAIL;
+ break;
+ }
+ err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size);
+ wrote += cur_size;
+ }
+ if (err!=ERROR_OK)
+ break;
+ }
+ }
+ duration_stop_measure(&duration, &duration_text);
+
+ if(err == ERROR_OK)
+ {
+ float speed;
+ speed=wrote / 1024.0;
+ speed/=((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0));
+ command_print(cmd_ctx, "wrote %d bytes to 0x%8.8x in %s (%f kb/s)",
+ count*wordsize, address, duration_text,
+ speed);
+ }
+ free(duration_text);
return ERROR_OK;
}
-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_binary <bank> <file> <offset>");
- 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)
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_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_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;
+ c->sectors[i].is_erased = 0;
}
}
}
/* 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)
+ {
+ LOG_ERROR("Bank is invalid");
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 */
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 (optional verify) 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)
+int flash_write(target_t *target, image_t *image, u32 *written, int erase)
{
- int retval;
- int i;
+ int retval=ERROR_OK;
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)
{
if (image->sections[section].size == 0)
{
- WARNING("empty section %d", section);
+ LOG_WARNING("empty section %d", section);
section++;
section_offset = 0;
continue;
/* 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;
{
if (image->sections[section_last + 1].base_address < (run_address + run_size))
{
- DEBUG("section %d out of order(very slightly surprising, but supported)", 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))
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,
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;
}
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 */
}
*written += run_size; /* add run size to total written counter */
}
- return ERROR_OK;
+ return retval;
}
-int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+int default_flash_blank_check(struct flash_bank_s *bank)
{
- if (argc != 1)
+ target_t *target = bank->target;
+ u8 buffer[1024];
+ int buffer_size=sizeof(buffer);
+ int i;
+ int nBytes;
+
+ if (bank->target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "usage: flash auto_erase <on|off>");
- return ERROR_OK;
+ return ERROR_TARGET_NOT_HALTED;
}
- if (strcmp(args[0], "on") == 0)
- auto_erase = 1;
- else if (strcmp(args[0], "off") == 0)
- auto_erase = 0;
+ int retval;
+ int fast_check=0;
+ working_area_t *erase_check_algorithm;
+#if 0
+ /* FIX! doesn't work yet... */
+ /*
+ char test(char *a, int len, char t)
+ {
+ int i=0;
+
+ for (i=0; i<len; i++)
+ {
+ t&=a[i];
+
+ }
+ }
+
+ $ arm-elf-gcc -c -mthumb -O3 test.c
+
+ $ arm-elf-objdump --disassemble test.o
+
+ test.o: file format elf32-littlearm
+
+ Disassembly of section .text:
+
+ 00000000 <test>:
+ 0: b510 push {r4, lr}
+ 2: 0612 lsl r2, r2, #24
+ 4: 1c04 mov r4, r0 (add r4, r0, #0)
+ 6: 0e10 lsr r0, r2, #24
+ 8: 2200 mov r2, #0
+ a: 2900 cmp r1, #0
+ c: dd04 ble 18 <test+0x18>
+ e: 5ca3 ldrb r3, [r4, r2]
+ 10: 3201 add r2, #1
+ 12: 4018 and r0, r3
+ 14: 428a cmp r2, r1
+ 16: dbfa blt e <test+0xe>
+ 18: bd10 pop {r4, pc}
+ 1a: 46c0 nop (mov r8, r8)
+
+
+ */
+ u16 erase_check_code[] =
+ {
+ 0x0612,// lsl r2, r2, #24
+ 0x1c04,// mov r4, r0 (add r4, r0, #0)
+ 0x0e10,// lsr r0, r2, #24
+ 0x2200,// mov r2, #0
+ 0x2900,// cmp r1, #0
+ 0xdd04,// ble 18 <test+0x18>
+ 0x5ca3,// ldrb r3, [r4, r2]
+ 0x3201,// add r2, #1
+ 0x4018,// and r0, r3
+ 0x428a,// cmp r2, r1
+ 0xdbfa,// blt e <test+0xe>
+ 0x46c0,// nop (mov r8, r8)
+
+ };
+
+
+
+ /* make sure we have a working area */
+ if (target_alloc_working_area(target, ((sizeof(erase_check_code)+3)/4)*4, &erase_check_algorithm) != ERROR_OK)
+ {
+ erase_check_algorithm = NULL;
+ }
+
+ if (erase_check_algorithm)
+ {
+ u8 erase_check_code_buf[((sizeof(erase_check_code)+3)/4)*4];
+ LOG_DEBUG("Running fast flash erase check");
+
+ for (i = 0; i < sizeof(erase_check_code)/sizeof(*erase_check_code); i++)
+ target_buffer_set_u16(target, erase_check_code_buf + (i*2), erase_check_code[i]);
+
+ /* write algorithm code to working area */
+ if ((retval=target->type->write_memory(target, erase_check_algorithm->address, 2, sizeof(erase_check_code)/sizeof(*erase_check_code), erase_check_code_buf))==ERROR_OK)
+ {
+ for (i = 0; i < bank->num_sectors; i++)
+ {
+ u32 address = bank->base + bank->sectors[i].offset;
+ u32 size = bank->sectors[i].size;
+
+ reg_param_t reg_params[3];
+ armv7m_algorithm_t arm_info;
+
+ arm_info.common_magic = ARMV7M_COMMON_MAGIC;
+ arm_info.core_mode = ARMV7M_MODE_ANY;
+ arm_info.core_state = ARMV7M_STATE_THUMB;
+
+ init_reg_param(®_params[0], "r0", 32, PARAM_OUT);
+ buf_set_u32(reg_params[0].value, 0, 32, address);
+
+ init_reg_param(®_params[1], "r1", 32, PARAM_OUT);
+ buf_set_u32(reg_params[1].value, 0, 32, size);
+
+ init_reg_param(®_params[2], "r2", 32, PARAM_IN_OUT);
+ buf_set_u32(reg_params[2].value, 0, 32, 0xff);
+
+ if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, erase_check_algorithm->address,
+ erase_check_algorithm->address + sizeof(erase_check_code) - 2, 10000, &arm_info)) != ERROR_OK)
+ break;
+
+ if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff)
+ bank->sectors[i].is_erased = 1;
+ else
+ bank->sectors[i].is_erased = 0;
+
+ destroy_reg_param(®_params[0]);
+ destroy_reg_param(®_params[1]);
+ destroy_reg_param(®_params[2]);
+ }
+ if (i == bank->num_sectors)
+ {
+ fast_check = 1;
+ }
+ }
+ target_free_working_area(target, erase_check_algorithm);
+ }
+#endif
+ if (!fast_check)
+ {
+ /* try ARM7 instead */
+
+ u32 erase_check_code[] =
+ {
+ 0xe4d03001, /* ldrb r3, [r0], #1 */
+ 0xe0022003, /* and r2, r2, r3 */
+ 0xe2511001, /* subs r1, r1, #1 */
+ 0x1afffffb, /* b -4 */
+ 0xeafffffe /* b 0 */
+ };
+
+ /* make sure we have a working area */
+ if (target_alloc_working_area(target, 20, &erase_check_algorithm) == ERROR_OK)
+ {
+ u8 erase_check_code_buf[5 * 4];
+
+ for (i = 0; i < 5; i++)
+ target_buffer_set_u32(target, erase_check_code_buf + (i*4), erase_check_code[i]);
+
+ /* write algorithm code to working area */
+ if ((retval=target->type->write_memory(target, erase_check_algorithm->address, 4, 5, erase_check_code_buf))==ERROR_OK)
+ {
+ for (i = 0; i < bank->num_sectors; i++)
+ {
+ u32 address = bank->base + bank->sectors[i].offset;
+ u32 size = bank->sectors[i].size;
+
+ reg_param_t reg_params[3];
+ armv4_5_algorithm_t armv4_5_info;
+
+ armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC;
+ armv4_5_info.core_mode = ARMV4_5_MODE_SVC;
+ armv4_5_info.core_state = ARMV4_5_STATE_ARM;
+
+ init_reg_param(®_params[0], "r0", 32, PARAM_OUT);
+ buf_set_u32(reg_params[0].value, 0, 32, address);
+
+ init_reg_param(®_params[1], "r1", 32, PARAM_OUT);
+ buf_set_u32(reg_params[1].value, 0, 32, size);
+
+ init_reg_param(®_params[2], "r2", 32, PARAM_IN_OUT);
+ buf_set_u32(reg_params[2].value, 0, 32, 0xff);
+
+ if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params,
+ erase_check_algorithm->address, erase_check_algorithm->address + 0x10, 10000, &armv4_5_info)) != ERROR_OK)
+ break;
+
+ if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff)
+ bank->sectors[i].is_erased = 1;
+ else
+ bank->sectors[i].is_erased = 0;
+
+ destroy_reg_param(®_params[0]);
+ destroy_reg_param(®_params[1]);
+ destroy_reg_param(®_params[2]);
+ }
+ if (i == bank->num_sectors)
+ {
+ fast_check = 1;
+ }
+ }
+ target_free_working_area(target, erase_check_algorithm);
+ }
+ }
+
+
+ if (!fast_check)
+ {
+ LOG_USER("Running slow fallback erase check - add working memory");
+ for (i = 0; i < bank->num_sectors; i++)
+ {
+ int j;
+ bank->sectors[i].is_erased = 1;
+
+ for (j=0; j<bank->sectors[i].size; j+=buffer_size)
+ {
+ int chunk;
+ int retval;
+ chunk=buffer_size;
+ if (chunk>(j-bank->sectors[i].size))
+ {
+ chunk=(j-bank->sectors[i].size);
+ }
+
+ retval=target->type->read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer);
+ if (retval!=ERROR_OK)
+ return retval;
+
+ for (nBytes = 0; nBytes < chunk; nBytes++)
+ {
+ if (buffer[nBytes] != 0xFF)
+ {
+ bank->sectors[i].is_erased = 0;
+ break;
+ }
+ }
+ }
+ }
+ }
return ERROR_OK;
}