static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock);
/* flash drivers
*/
extern flash_driver_t ocl_flash;
extern flash_driver_t pic32mx_flash;
extern flash_driver_t avr_flash;
+extern flash_driver_t faux_flash;
flash_driver_t *flash_drivers[] = {
&lpc2000_flash,
&ocl_flash,
&pic32mx_flash,
&avr_flash,
+ &faux_flash,
NULL,
};
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 [erase] <file> [offset] [type]");
+ "write_image [erase] [unlock] <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 p;
}
+int flash_command_get_bank_by_num(
+ struct command_context_s *cmd_ctx, char *str, flash_bank_t **bank)
+{
+ unsigned bank_num;
+ COMMAND_PARSE_NUMBER(uint, str, bank_num);
+
+ *bank = get_flash_bank_by_num(bank_num);
+ if (!*bank)
+ {
+ command_print(cmd_ctx,
+ "flash bank '#%u' not found", bank_num);
+ return ERROR_INVALID_ARGUMENTS;
+ }
+ return ERROR_OK;
+}
+
+
static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
int retval;
c->target = target;
c->driver = flash_drivers[i];
c->driver_priv = NULL;
- c->base = strtoul(args[1], NULL, 0);
- c->size = strtoul(args[2], NULL, 0);
- c->chip_width = strtoul(args[3], NULL, 0);
- c->bus_width = strtoul(args[4], NULL, 0);
+ COMMAND_PARSE_NUMBER(u32, args[1], c->base);
+ COMMAND_PARSE_NUMBER(u32, args[2], c->size);
+ COMMAND_PARSE_NUMBER(int, args[3], c->chip_width);
+ COMMAND_PARSE_NUMBER(int, args[4], c->bus_width);
c->num_sectors = 0;
c->sectors = NULL;
c->next = NULL;
int retval;
if (argc != 1)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
+
+ unsigned bank_nr;
+ COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
for (p = flash_banks; p; p = p->next, i++)
{
- if (i == strtoul(args[0], NULL, 0))
+ if (i == bank_nr)
{
char buf[1024];
static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- flash_bank_t *p;
int retval;
if (argc != 1)
return ERROR_COMMAND_SYNTAX_ERROR;
}
- p = get_flash_bank_by_num_noprobe(strtoul(args[0], NULL, 0));
+ unsigned bank_nr;
+ COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
+ flash_bank_t *p = get_flash_bank_by_num_noprobe(bank_nr);
if (p)
{
if ((retval = p->driver->probe(p)) == ERROR_OK)
static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- flash_bank_t *p;
- int retval;
-
if (argc != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
+ flash_bank_t *p;
+ int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+ if (ERROR_OK != retval)
+ return retval;
+
if (p)
{
int j;
target_t *target = get_current_target(cmd_ctx);
if (argc != 2)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
- address = strtoul(args[0], NULL, 0);
- length = strtoul(args[1], NULL, 0);
+ COMMAND_PARSE_NUMBER(int, args[0], address);
+ COMMAND_PARSE_NUMBER(int, args[1], length);
if (length <= 0)
{
command_print(cmd_ctx, "Length must be >0");
static 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)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
- p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
+ flash_bank_t *p;
+ int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+ if (ERROR_OK != retval)
+ return retval;
+
if (p)
{
+ int retval;
if ((retval = p->driver->protect_check(p)) == ERROR_OK)
{
command_print(cmd_ctx, "successfully checked protect state");
command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base);
}
}
- else
- {
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
return ERROR_OK;
}
static int flash_check_sector_parameters(struct command_context_s *cmd_ctx,
- uint32_t first, uint32_t last, uint num_sectors)
+ uint32_t first, uint32_t last, uint32_t num_sectors)
{
if (!(first <= last)) {
command_print(cmd_ctx, "ERROR: "
}
if (!(last <= (num_sectors - 1))) {
- command_print(cmd_ctx, "ERROR: "
- "last sector must be <= %d", num_sectors - 1);
+ command_print(cmd_ctx, "ERROR: last sector must be <= %d",
+ (int) num_sectors - 1);
return ERROR_FAIL;
}
uint32_t bank_nr;
uint32_t first;
uint32_t last;
- int retval;
-
- if ((retval = parse_u32(args[0], &bank_nr)) != ERROR_OK)
- return retval;
+ COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
flash_bank_t *p = get_flash_bank_by_num(bank_nr);
if (!p)
return ERROR_OK;
- if ((retval = parse_u32(args[1], &first)) != ERROR_OK)
- return retval;
+ COMMAND_PARSE_NUMBER(u32, args[1], first);
if (strcmp(args[2], "last") == 0)
last = p->num_sectors - 1;
else
- if ((retval = parse_u32(args[2], &last)) != ERROR_OK)
- return retval;
+ COMMAND_PARSE_NUMBER(u32, args[2], last);
+ int retval;
if ((retval = flash_check_sector_parameters(cmd_ctx,
first, last, p->num_sectors)) != ERROR_OK)
return retval;
return retval;
command_print(cmd_ctx, "erased sectors %i through %i "
"on flash bank %i in %s",
- first, last, bank_nr, duration_text);
+ (int) first, (int) last, (int) bank_nr,
+ duration_text);
free(duration_text);
}
}
uint32_t bank_nr;
uint32_t first;
uint32_t last;
- int retval;
int set;
- if ((retval = parse_u32(args[0], &bank_nr)) != ERROR_OK)
- return retval;
-
+ COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
flash_bank_t *p = get_flash_bank_by_num(bank_nr);
if (!p)
return ERROR_OK;
- if ((retval = parse_u32(args[1], &first)) != ERROR_OK)
- return retval;
+ COMMAND_PARSE_NUMBER(u32, args[1], first);
if (strcmp(args[2], "last") == 0)
last = p->num_sectors - 1;
else
- if ((retval = parse_u32(args[2], &last)) != ERROR_OK)
- return retval;
+ COMMAND_PARSE_NUMBER(u32, args[2], last);
if (strcmp(args[3], "on") == 0)
set = 1;
else
return ERROR_COMMAND_SYNTAX_ERROR;
+ int retval;
if ((retval = flash_check_sector_parameters(cmd_ctx,
first, last, p->num_sectors)) != ERROR_OK)
return retval;
if (retval == ERROR_OK) {
command_print(cmd_ctx, "%s protection for sectors %i "
"through %i on flash bank %i",
- (set) ? "set" : "cleared", first,
- last, bank_nr);
+ (set) ? "set" : "cleared", (int) first,
+ (int) last, (int) bank_nr);
}
}
else
/* flash auto-erase is disabled by default*/
int auto_erase = 0;
+ bool auto_unlock = false;
- if (strcmp(args[0], "erase") == 0)
+ for (;;)
{
- auto_erase = 1;
- args++;
- argc--;
- command_print(cmd_ctx, "auto erase enabled");
+ if (strcmp(args[0], "erase") == 0)
+ {
+ auto_erase = 1;
+ args++;
+ argc--;
+ command_print(cmd_ctx, "auto erase enabled");
+ } else if (strcmp(args[0], "unlock") == 0)
+ {
+ auto_unlock = true;
+ args++;
+ argc--;
+ command_print(cmd_ctx, "auto unlock enabled");
+ } else
+ {
+ break;
+ }
}
if (argc < 1)
if (argc >= 2)
{
image.base_address_set = 1;
- image.base_address = strtoul(args[1], NULL, 0);
+ COMMAND_PARSE_NUMBER(int, args[1], image.base_address);
}
else
{
return retval;
}
- retval = flash_write(target, &image, &written, auto_erase);
+ retval = flash_write_unlock(target, &image, &written, auto_erase, auto_unlock);
if (retval != ERROR_OK)
{
image_close(&image);
uint32_t 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);
+ COMMAND_PARSE_NUMBER(u32, args[0], address);
+ COMMAND_PARSE_NUMBER(u32, args[1], pattern);
+ COMMAND_PARSE_NUMBER(u32, args[2], count);
if (count == 0)
return ERROR_OK;
duration_t duration;
char *duration_text;
- int retval, retvaltemp;
- flash_bank_t *p;
if (argc != 3)
- {
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;
- }
+ flash_bank_t *p;
+ int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+ if (ERROR_OK != retval)
+ return retval;
+
+ COMMAND_PARSE_NUMBER(u32, args[2], offset);
if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{
free(buffer);
buffer = NULL;
+ int retvaltemp;
if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
{
fileio_close(&fileio);
}
if (retval == ERROR_OK)
{
- command_print(cmd_ctx,
- "wrote %lld byte from file %s to flash bank %li at offset 0x%8.8" PRIx32 " 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)));
+ float elapsed = (float)duration.duration.tv_sec;
+ elapsed += (float)duration.duration.tv_usec / 1000000.0;
+ float speed = (float)fileio.size / elapsed;
+ command_print(cmd_ctx,
+ "wrote %lld byte from file %s to flash bank %u "
+ "at offset 0x%8.8" PRIx32 " in %s (%f kb/s)",
+ fileio.size, args[1], p->bank_number, offset,
+ duration_text, speed / 1024);
}
free(duration_text);
}
/* erase given flash region, selects proper bank according to target and address */
-int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
+static int flash_iterate_address_range(target_t *target, uint32_t addr, uint32_t length,
+ int (*callback)(struct flash_bank_s *bank, int first, int last))
{
flash_bank_t *c;
int first = -1;
if (addr != c->base)
return ERROR_FLASH_DST_BREAKS_ALIGNMENT;
- return flash_driver_erase(c, 0, c->num_sectors - 1);
+ return callback(c, 0, c->num_sectors - 1);
}
/* check whether it fits */
if (first == -1 || last == -1)
return ERROR_OK;
- return flash_driver_erase(c, first, last);
+ return callback(c, first, last);
+}
+
+
+
+int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
+{
+ return flash_iterate_address_range(target, addr, length, &flash_driver_erase);
+}
+
+static int flash_driver_unprotect(struct flash_bank_s *bank, int first, int last)
+{
+ return flash_driver_protect(bank, 0, first, last);
+}
+
+static int flash_unlock_address_range(target_t *target, uint32_t addr, uint32_t length)
+{
+ return flash_iterate_address_range(target, addr, length, &flash_driver_unprotect);
}
+
/* write (optional verify) an image to flash memory of the given target */
-int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
+static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock)
{
int retval = ERROR_OK;
retval = ERROR_OK;
- if (erase)
+ if (unlock)
{
- /* calculate and erase sectors */
- retval = flash_erase_address_range(target, run_address, run_size);
+ retval = flash_unlock_address_range(target, run_address, run_size);
+ }
+ if (retval == ERROR_OK)
+ {
+ if (erase)
+ {
+ /* calculate and erase sectors */
+ retval = flash_erase_address_range(target, run_address, run_size);
+ }
}
if (retval == ERROR_OK)
return retval;
}
+int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
+{
+ return flash_write_unlock(target, image, written, erase, false);
+}
+
int default_flash_mem_blank_check(struct flash_bank_s *bank)
{
target_t *target = bank->target;