X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=329ade6364d0cb39378d4e2ba6baaceea5bcbc7d;hb=ff61e6a37ce79f00957fc5aeb304291e5fa06323;hp=d1b023c55b28e11dd369599f553e133510b6842d;hpb=a0b1e05b5300817e1fe2bc4dae31601d02cfd815;p=openocd

diff --git a/src/flash/flash.c b/src/flash/flash.c
index d1b023c5..329ade63 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -43,6 +43,7 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 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
  */
@@ -63,6 +64,7 @@ extern flash_driver_t ecosflash_flash;
 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,
@@ -82,6 +84,7 @@ flash_driver_t *flash_drivers[] = {
 	&ocl_flash,
 	&pic32mx_flash,
 	&avr_flash,
+	&faux_flash,
 	NULL,
 };
 
@@ -174,35 +177,35 @@ int flash_init_drivers(struct command_context_s *cmd_ctx)
 {
 	register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the flash banks");
 
-	if (flash_banks)
-	{
-		register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC,
-						 "print info about flash bank <num>");
-		register_command(cmd_ctx, flash_cmd, "probe", handle_flash_probe_command, COMMAND_EXEC,
-						 "identify flash bank <num>");
-		register_command(cmd_ctx, flash_cmd, "erase_check", handle_flash_erase_check_command, COMMAND_EXEC,
-						 "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_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, "fillw", handle_flash_fill_command, COMMAND_EXEC,
-						 "fill with pattern (no autoerase) <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 [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>");
-	}
+	if (!flash_banks)
+		return ERROR_OK;
+
+	register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC,
+					 "print info about flash bank <num>");
+	register_command(cmd_ctx, flash_cmd, "probe", handle_flash_probe_command, COMMAND_EXEC,
+					 "identify flash bank <num>");
+	register_command(cmd_ctx, flash_cmd, "erase_check", handle_flash_erase_check_command, COMMAND_EXEC,
+					 "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_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, "fillw", handle_flash_fill_command, COMMAND_EXEC,
+					 "fill with pattern (no autoerase) <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 [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 ERROR_OK;
 }
@@ -252,6 +255,23 @@ flash_bank_t *get_flash_bank_by_num(int num)
 	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;
@@ -272,54 +292,54 @@ static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cm
 
 	for (i = 0; flash_drivers[i]; i++)
 	{
-		if (strcmp(args[0], flash_drivers[i]->name) == 0)
-		{
-			flash_bank_t *p, *c;
+		if (strcmp(args[0], flash_drivers[i]->name) != 0)
+			continue;
 
-			/* register flash specific commands */
-			if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
-			{
-				LOG_ERROR("couldn't register '%s' commands", args[0]);
-				return ERROR_FAIL;
-			}
+		flash_bank_t *p, *c;
 
-			c = malloc(sizeof(flash_bank_t));
-			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);
-			c->num_sectors = 0;
-			c->sectors = NULL;
-			c->next = NULL;
-
-			if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
-			{
-				LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
-				free(c);
-				return retval;
-			}
+		/* register flash specific commands */
+		if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
+		{
+			LOG_ERROR("couldn't register '%s' commands", args[0]);
+			return ERROR_FAIL;
+		}
 
-			/* put flash bank in linked list */
-			if (flash_banks)
-			{
-				int	bank_num = 0;
-				/* find last flash bank */
-				for (p = flash_banks; p && p->next; p = p->next) bank_num++;
-				if (p)
-					p->next = c;
-				c->bank_number = bank_num + 1;
-			}
-			else
-			{
-				flash_banks = c;
-				c->bank_number = 0;
-			}
+		c = malloc(sizeof(flash_bank_t));
+		c->target = target;
+		c->driver = flash_drivers[i];
+		c->driver_priv = NULL;
+		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;
+
+		if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
+		{
+			LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
+			free(c);
+			return retval;
+		}
 
-			found = 1;
+		/* put flash bank in linked list */
+		if (flash_banks)
+		{
+			int	bank_num = 0;
+			/* find last flash bank */
+			for (p = flash_banks; p && p->next; p = p->next) bank_num++;
+			if (p)
+				p->next = c;
+			c->bank_number = bank_num + 1;
+		}
+		else
+		{
+			flash_banks = c;
+			c->bank_number = 0;
 		}
+
+		found = 1;
 	}
 
 	/* no matching flash driver found */
@@ -340,54 +360,55 @@ static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cm
 	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)
+			continue;
+
+		char buf[1024];
+
+		/* attempt auto probe */
+		if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
+			return retval;
+
+		command_print(cmd_ctx,
+			      "#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", 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 buf[1024];
+			char *protect_state;
 
-			/* attempt auto probe */
-			if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
-				return retval;
+			if (p->sectors[j].is_protected == 0)
+				protect_state = "not protected";
+			else if (p->sectors[j].is_protected == 1)
+				protect_state = "protected";
+			else
+				protect_state = "protection state unknown";
 
 			command_print(cmd_ctx,
-				      "#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", 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 *protect_state;
-
-				if (p->sectors[j].is_protected == 0)
-					protect_state = "not protected";
-				else if (p->sectors[j].is_protected == 1)
-					protect_state = "protected";
-				else
-					protect_state = "protection state unknown";
-
-				command_print(cmd_ctx,
-					      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
-					      j,
-					      p->sectors[j].offset,
-					      p->sectors[j].size,
-					      p->sectors[j].size >> 10,
-					      protect_state);
-			}
-
-			*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);
+				      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
+				      j,
+				      p->sectors[j].offset,
+				      p->sectors[j].size,
+				      p->sectors[j].size >> 10,
+				      protect_state);
 		}
+
+		*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;
@@ -395,7 +416,6 @@ static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cm
 
 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)
@@ -403,7 +423,9 @@ static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *c
 		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)
@@ -431,47 +453,45 @@ static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *c
 
 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));
-	if (p)
-	{
-		int j;
-		if ((retval = p->driver->erase_check(p)) == ERROR_OK)
-		{
-			command_print(cmd_ctx, "successfully checked erase state");
-		}
-		else
-		{
-			command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
-				args[0], p->base);
-		}
+	flash_bank_t *p;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-		for (j = 0; j < p->num_sectors; j++)
-		{
-			char *erase_state;
+	int j;
+	if ((retval = p->driver->erase_check(p)) == ERROR_OK)
+	{
+		command_print(cmd_ctx, "successfully checked erase state");
+	}
+	else
+	{
+		command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
+			args[0], p->base);
+	}
 
-			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";
+	for (j = 0; j < p->num_sectors; j++)
+	{
+		char *erase_state;
 
-			command_print(cmd_ctx,
-				      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
-				      j,
-				      p->sectors[j].offset,
-				      p->sectors[j].size,
-				      p->sectors[j].size >> 10,
-				      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#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
+			      j,
+			      p->sectors[j].offset,
+			      p->sectors[j].size,
+			      p->sectors[j].size >> 10,
+			      erase_state);
 	}
 
 	return ERROR_OK;
@@ -489,12 +509,10 @@ static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx,
 	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");
@@ -527,33 +545,25 @@ static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx,
 
 static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+	if (argc != 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	flash_bank_t *p;
-	int retval;
+	int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-	if (argc != 1)
+	if ((retval = p->driver->protect_check(p)) == ERROR_OK)
 	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
+		command_print(cmd_ctx, "successfully checked protect state");
 	}
-
-	p = get_flash_bank_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+	else if (retval == ERROR_FLASH_OPERATION_FAILED)
 	{
-		if ((retval = p->driver->protect_check(p)) == ERROR_OK)
-		{
-			command_print(cmd_ctx, "successfully checked protect state");
-		}
-		else if (retval == ERROR_FLASH_OPERATION_FAILED)
-		{
-			command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, args[0], p->base);
-		}
-		else
-		{
-			command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base);
-		}
+		command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, args[0], p->base);
 	}
 	else
 	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
+		command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base);
 	}
 
 	return ERROR_OK;
@@ -580,49 +590,43 @@ static int flash_check_sector_parameters(struct command_context_s *cmd_ctx,
 static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
 		char *cmd, char **args, int argc)
 {
-	if (argc > 2)
-	{
-		uint32_t bank_nr;
-		uint32_t first;
-		uint32_t last;
-		int retval;
+	if (argc != 2)
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
-		if ((retval = parse_u32(args[0], &bank_nr)) != ERROR_OK)
-			return retval;
+	uint32_t bank_nr;
+	uint32_t first;
+	uint32_t last;
 
-		flash_bank_t *p = get_flash_bank_by_num(bank_nr);
-		if (!p)
-			return ERROR_OK;
+	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;
-		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[1], first);
+	if (strcmp(args[2], "last") == 0)
+		last = p->num_sectors - 1;
+	else
+		COMMAND_PARSE_NUMBER(u32, args[2], last);
 
-		if ((retval = flash_check_sector_parameters(cmd_ctx,
-				first, last, p->num_sectors)) != ERROR_OK)
-			return retval;
+	int retval;
+	if ((retval = flash_check_sector_parameters(cmd_ctx,
+			first, last, p->num_sectors)) != ERROR_OK)
+		return retval;
 
-		duration_t duration;
-		char *duration_text;
-		duration_start_measure(&duration);
+	duration_t duration;
+	char *duration_text;
+	duration_start_measure(&duration);
 
-		if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK) {
-			if ((retval = duration_stop_measure(&duration,
-						&duration_text)) != ERROR_OK)
-				return retval;
-			command_print(cmd_ctx, "erased sectors %i through %i "
-					"on flash bank %i in %s",
-				(int) first, (int) last, (int) bank_nr,
-				duration_text);
-			free(duration_text);
-		}
+	if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK) {
+		if ((retval = duration_stop_measure(&duration,
+					&duration_text)) != ERROR_OK)
+			return retval;
+		command_print(cmd_ctx, "erased sectors %i through %i "
+				"on flash bank %i in %s",
+			(int) first, (int) last, (int) bank_nr,
+			duration_text);
+		free(duration_text);
 	}
-	else
-		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	return ERROR_OK;
 }
@@ -630,50 +634,44 @@ static int handle_flash_erase_command(struct command_context_s *cmd_ctx,
 static int handle_flash_protect_command(struct command_context_s *cmd_ctx,
 		char *cmd, char **args, int argc)
 {
-	if (argc > 3)
-	{
-		uint32_t bank_nr;
-		uint32_t first;
-		uint32_t last;
-		int retval;
-		int set;
+	if (argc != 3)
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
-		if ((retval = parse_u32(args[0], &bank_nr)) != ERROR_OK)
-			return retval;
+	uint32_t bank_nr;
+	uint32_t first;
+	uint32_t last;
+	int set;
 
-		flash_bank_t *p = get_flash_bank_by_num(bank_nr);
-		if (!p)
-			return ERROR_OK;
+	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;
-		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[1], first);
+	if (strcmp(args[2], "last") == 0)
+		last = p->num_sectors - 1;
+	else
+		COMMAND_PARSE_NUMBER(u32, args[2], last);
 
-		if (strcmp(args[3], "on") == 0)
-			set = 1;
-		else if (strcmp(args[3], "off") == 0)
-			set = 0;
-		else
-			return ERROR_COMMAND_SYNTAX_ERROR;
+	if (strcmp(args[3], "on") == 0)
+		set = 1;
+	else if (strcmp(args[3], "off") == 0)
+		set = 0;
+	else
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
-		if ((retval = flash_check_sector_parameters(cmd_ctx,
-				first, last, p->num_sectors)) != ERROR_OK)
-			return retval;
+	int retval;
+	if ((retval = flash_check_sector_parameters(cmd_ctx,
+			first, last, p->num_sectors)) != ERROR_OK)
+		return retval;
 
-		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", (int) first,
-				(int) last, (int) bank_nr);
-		}
+	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", (int) first,
+			(int) last, (int) bank_nr);
 	}
-	else
-		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	return ERROR_OK;
 }
@@ -697,13 +695,26 @@ static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, c
 
 	/* 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)
@@ -722,7 +733,7 @@ static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, c
 	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
 	{
@@ -738,7 +749,7 @@ static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, c
 		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);
@@ -785,13 +796,11 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm
 	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;
@@ -895,23 +904,18 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 	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)
 	{
@@ -931,6 +935,7 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 	free(buffer);
 	buffer = NULL;
 
+	int retvaltemp;
 	if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK)
 	{
 		fileio_close(&fileio);
@@ -938,14 +943,14 @@ static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, ch
 	}
 	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);
 
@@ -994,7 +999,8 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, uint32_t addr)
 }
 
 /* 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;
@@ -1016,7 +1022,7 @@ int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
 		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 */
@@ -1039,11 +1045,29 @@ int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length)
 	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;
 
@@ -1166,10 +1190,17 @@ int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
 
 		retval = ERROR_OK;
 
-		if (erase)
+		if (unlock)
+		{
+			retval = flash_unlock_address_range(target, run_address, run_size);
+		}
+		if (retval == ERROR_OK)
 		{
-			/* calculate and erase sectors */
-			retval = flash_erase_address_range(target, run_address, run_size);
+			if (erase)
+			{
+				/* calculate and erase sectors */
+				retval = flash_erase_address_range(target, run_address, run_size);
+			}
 		}
 
 		if (retval == ERROR_OK)
@@ -1195,6 +1226,11 @@ int flash_write(target_t *target, image_t *image, uint32_t *written, int erase)
 	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;