X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=d16949da4cb5e28b9a5f5ff320e06703aeef7c15;hb=2a402ae2c7bf5ce515ff5bfdd7d68f875686e289;hp=bdee53b626fea28f70f632f27a72dadf6ed6e14e;hpb=e84849f5ed7416c758914bea88a31827259c4f5b;p=openocd.git

diff --git a/src/flash/flash.c b/src/flash/flash.c
index bdee53b626..d16949da4c 100644
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -28,8 +28,9 @@
 #endif
 
 #include "flash.h"
-#include "image.h"
-#include "time_support.h"
+#include "common.h"
+#include <target/image.h>
+#include <helper/time_support.h>
 
 static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock);
 
@@ -77,7 +78,6 @@ struct flash_driver *flash_drivers[] = {
 };
 
 struct flash_bank *flash_banks;
-static 	struct command *flash_cmd;
 
 /* wafer thin wrapper for invoking the flash driver */
 static int flash_driver_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
@@ -180,6 +180,25 @@ int flash_get_bank_count(void)
 	return i;
 }
 
+struct flash_bank *get_flash_bank_by_name(const char *name)
+{
+	unsigned requested = get_flash_name_index(name);
+	unsigned found = 0;
+
+	struct flash_bank *bank;
+	for (bank = flash_banks; NULL != bank; bank = bank->next)
+	{
+		if (strcmp(bank->name, name) == 0)
+			return bank;
+		if (!flash_driver_name_matches(bank->driver->name, name))
+			continue;
+		if (++found < requested)
+			continue;
+		return bank;
+	}
+	return NULL;
+}
+
 struct flash_bank *get_flash_bank_by_num(int num)
 {
 	struct flash_bank *p = get_flash_bank_by_num_noprobe(num);
@@ -198,17 +217,21 @@ struct flash_bank *get_flash_bank_by_num(int num)
 	return p;
 }
 
-COMMAND_HELPER(flash_command_get_bank_by_num,
-	unsigned name_index, struct flash_bank **bank)
+COMMAND_HELPER(flash_command_get_bank, unsigned name_index,
+		struct flash_bank **bank)
 {
+	const char *name = CMD_ARGV[name_index];
+	*bank = get_flash_bank_by_name(name);
+	if (*bank)
+		return ERROR_OK;
+
 	unsigned bank_num;
-	COMMAND_PARSE_NUMBER(uint, args[name_index], bank_num);
+	COMMAND_PARSE_NUMBER(uint, name, bank_num);
 
 	*bank = get_flash_bank_by_num(bank_num);
 	if (!*bank)
 	{
-		command_print(cmd_ctx,
-			"flash bank '#%u' not found", bank_num);
+		command_print(CMD_CTX, "flash bank '%s' not found", name);
 		return ERROR_INVALID_ARGUMENTS;
 	}
 	return ERROR_OK;
@@ -217,52 +240,62 @@ COMMAND_HELPER(flash_command_get_bank_by_num,
 
 COMMAND_HANDLER(handle_flash_bank_command)
 {
-	int retval;
-	int i;
-	int found = 0;
-	struct target *target;
-
-	if (argc < 6)
+	if (CMD_ARGC < 7)
 	{
+		LOG_ERROR("usage: flash bank <name> <driver> "
+				"<base> <size> <chip_width> <bus_width>");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
+	// save bank name and advance arguments for compatibility
+	const char *bank_name = *CMD_ARGV++;
+	CMD_ARGC--;
 
-	if ((target = get_target(args[5])) == NULL)
+	struct target *target;
+	if ((target = get_target(CMD_ARGV[5])) == NULL)
 	{
-		LOG_ERROR("target '%s' not defined", args[5]);
+		LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
 		return ERROR_FAIL;
 	}
 
-	for (i = 0; flash_drivers[i]; i++)
+	const char *driver_name = CMD_ARGV[0];
+	for (unsigned i = 0; flash_drivers[i]; i++)
 	{
-		if (strcmp(args[0], flash_drivers[i]->name) != 0)
+		if (strcmp(driver_name, flash_drivers[i]->name) != 0)
 			continue;
 
-		struct flash_bank *p, *c;
-
 		/* register flash specific commands */
-		if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK)
+		if (NULL != flash_drivers[i]->commands)
 		{
-			LOG_ERROR("couldn't register '%s' commands", args[0]);
-			return ERROR_FAIL;
+			int retval = register_commands(CMD_CTX, NULL,
+					flash_drivers[i]->commands);
+			if (ERROR_OK != retval)
+			{
+				LOG_ERROR("couldn't register '%s' commands",
+						driver_name);
+				return ERROR_FAIL;
+			}
 		}
 
+		struct flash_bank *p, *c;
 		c = malloc(sizeof(struct flash_bank));
+		c->name = strdup(bank_name);
 		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);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], c->base);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], c->size);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], c->chip_width);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[4], c->bus_width);
 		c->num_sectors = 0;
 		c->sectors = NULL;
 		c->next = NULL;
 
+		int retval;
 		retval = CALL_COMMAND_HANDLER(flash_drivers[i]->flash_bank_command, c);
 		if (ERROR_OK != retval)
 		{
-			LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
+			LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32,
+					driver_name, c->base);
 			free(c);
 			return retval;
 		}
@@ -283,17 +316,12 @@ COMMAND_HANDLER(handle_flash_bank_command)
 			c->bank_number = 0;
 		}
 
-		found = 1;
+		return ERROR_OK;
 	}
 
 	/* no matching flash driver found */
-	if (!found)
-	{
-		LOG_ERROR("flash driver '%s' not found", args[0]);
-		return ERROR_FAIL;
-	}
-
-	return ERROR_OK;
+	LOG_ERROR("flash driver '%s' not found", driver_name);
+	return ERROR_FAIL;
 }
 
 COMMAND_HANDLER(handle_flash_info_command)
@@ -303,11 +331,11 @@ COMMAND_HANDLER(handle_flash_info_command)
 	int j = 0;
 	int retval;
 
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	unsigned bank_nr;
-	COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
+	COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr);
 
 	for (p = flash_banks; p; p = p->next, i++)
 	{
@@ -320,7 +348,7 @@ COMMAND_HANDLER(handle_flash_info_command)
 		if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
 			return retval;
 
-		command_print(cmd_ctx,
+		command_print(CMD_CTX,
 			      "#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i",
 			      i,
 			      p->driver->name,
@@ -339,7 +367,7 @@ COMMAND_HANDLER(handle_flash_info_command)
 			else
 				protect_state = "protection state unknown";
 
-			command_print(cmd_ctx,
+			command_print(CMD_CTX,
 				      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
 				      j,
 				      p->sectors[j].offset,
@@ -350,7 +378,7 @@ COMMAND_HANDLER(handle_flash_info_command)
 
 		*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);
+		command_print(CMD_CTX, "%s", buf);
 		if (retval != ERROR_OK)
 			LOG_ERROR("error retrieving flash info (%d)", retval);
 	}
@@ -362,34 +390,34 @@ COMMAND_HANDLER(handle_flash_probe_command)
 {
 	int retval;
 
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	unsigned bank_nr;
-	COMMAND_PARSE_NUMBER(uint, args[0], bank_nr);
+	COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], bank_nr);
 	struct flash_bank *p = get_flash_bank_by_num_noprobe(bank_nr);
 	if (p)
 	{
 		if ((retval = p->driver->probe(p)) == ERROR_OK)
 		{
-			command_print(cmd_ctx, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
+			command_print(CMD_CTX, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
 		}
 		else if (retval == ERROR_FLASH_BANK_INVALID)
 		{
-			command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
-						  args[0], p->base);
+			command_print(CMD_CTX, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
+						  CMD_ARGV[0], p->base);
 		}
 		else
 		{
-			command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
-						  args[0], p->base);
+			command_print(CMD_CTX, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
+						  CMD_ARGV[0], p->base);
 		}
 	}
 	else
 	{
-		command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]);
+		command_print(CMD_CTX, "flash bank '#%s' is out of bounds", CMD_ARGV[0]);
 	}
 
 	return ERROR_OK;
@@ -397,25 +425,25 @@ COMMAND_HANDLER(handle_flash_probe_command)
 
 COMMAND_HANDLER(handle_flash_erase_check_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct flash_bank *p;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
 	int j;
 	if ((retval = p->driver->erase_check(p)) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "successfully checked erase state");
+		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);
+		command_print(CMD_CTX, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
+			CMD_ARGV[0], p->base);
 	}
 
 	for (j = 0; j < p->num_sectors; j++)
@@ -429,7 +457,7 @@ COMMAND_HANDLER(handle_flash_erase_check_command)
 		else
 			erase_state = "erase state unknown";
 
-		command_print(cmd_ctx,
+		command_print(CMD_CTX,
 			      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
 			      j,
 			      p->sectors[j].offset,
@@ -448,16 +476,16 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
 	int address;
 	int length;
 
-	struct target *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(CMD_CTX);
 
-	if (argc != 2)
+	if (CMD_ARGC != 2)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	COMMAND_PARSE_NUMBER(int, args[0], address);
-	COMMAND_PARSE_NUMBER(int, args[1], length);
+	COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], address);
+	COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], length);
 	if (length <= 0)
 	{
-		command_print(cmd_ctx, "Length must be >0");
+		command_print(CMD_CTX, "Length must be >0");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
@@ -477,7 +505,7 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
 
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
-		command_print(cmd_ctx, "erased address 0x%8.8x (length %i)"
+		command_print(CMD_CTX, "erased address 0x%8.8x (length %i)"
 				" in %fs (%0.3f kb/s)", address, length,
 				duration_elapsed(&bench), duration_kbps(&bench, length));
 	}
@@ -487,25 +515,25 @@ COMMAND_HANDLER(handle_flash_erase_address_command)
 
 COMMAND_HANDLER(handle_flash_protect_check_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	struct flash_bank *p;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
 	if ((retval = p->driver->protect_check(p)) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "successfully checked protect state");
+		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);
+		command_print(CMD_CTX, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, CMD_ARGV[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, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, CMD_ARGV[0], p->base);
 	}
 
 	return ERROR_OK;
@@ -531,26 +559,26 @@ static int flash_check_sector_parameters(struct command_context *cmd_ctx,
 
 COMMAND_HANDLER(handle_flash_erase_command)
 {
-	if (argc != 2)
+	if (CMD_ARGC != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	uint32_t bank_nr;
 	uint32_t first;
 	uint32_t last;
 
-	COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
 	struct flash_bank *p = get_flash_bank_by_num(bank_nr);
 	if (!p)
 		return ERROR_OK;
 
-	COMMAND_PARSE_NUMBER(u32, args[1], first);
-	if (strcmp(args[2], "last") == 0)
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], first);
+	if (strcmp(CMD_ARGV[2], "last") == 0)
 		last = p->num_sectors - 1;
 	else
-		COMMAND_PARSE_NUMBER(u32, args[2], last);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], last);
 
 	int retval;
-	if ((retval = flash_check_sector_parameters(cmd_ctx,
+	if ((retval = flash_check_sector_parameters(CMD_CTX,
 			first, last, p->num_sectors)) != ERROR_OK)
 		return retval;
 
@@ -561,7 +589,7 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
-		command_print(cmd_ctx, "erased sectors %" PRIu32 " "
+		command_print(CMD_CTX, "erased sectors %" PRIu32 " "
 				"through %" PRIu32" on flash bank %" PRIu32 " "
 				"in %fs", first, last, bank_nr, duration_elapsed(&bench));
 	}
@@ -571,40 +599,35 @@ COMMAND_HANDLER(handle_flash_erase_command)
 
 COMMAND_HANDLER(handle_flash_protect_command)
 {
-	if (argc != 3)
+	if (CMD_ARGC != 4)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	uint32_t bank_nr;
 	uint32_t first;
 	uint32_t last;
-	int set;
 
-	COMMAND_PARSE_NUMBER(u32, args[0], bank_nr);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], bank_nr);
 	struct flash_bank *p = get_flash_bank_by_num(bank_nr);
 	if (!p)
 		return ERROR_OK;
 
-	COMMAND_PARSE_NUMBER(u32, args[1], first);
-	if (strcmp(args[2], "last") == 0)
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], first);
+	if (strcmp(CMD_ARGV[2], "last") == 0)
 		last = p->num_sectors - 1;
 	else
-		COMMAND_PARSE_NUMBER(u32, args[2], last);
+		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[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;
+	bool set;
+	COMMAND_PARSE_ON_OFF(CMD_ARGV[3], set);
 
 	int retval;
-	if ((retval = flash_check_sector_parameters(cmd_ctx,
+	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 "
+		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);
@@ -615,14 +638,14 @@ COMMAND_HANDLER(handle_flash_protect_command)
 
 COMMAND_HANDLER(handle_flash_write_image_command)
 {
-	struct target *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(CMD_CTX);
 
 	struct image image;
 	uint32_t written;
 
 	int retval;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
@@ -633,25 +656,25 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 
 	for (;;)
 	{
-		if (strcmp(args[0], "erase") == 0)
+		if (strcmp(CMD_ARGV[0], "erase") == 0)
 		{
 			auto_erase = 1;
-			args++;
-			argc--;
-			command_print(cmd_ctx, "auto erase enabled");
-		} else if (strcmp(args[0], "unlock") == 0)
+			CMD_ARGV++;
+			CMD_ARGC--;
+			command_print(CMD_CTX, "auto erase enabled");
+		} else if (strcmp(CMD_ARGV[0], "unlock") == 0)
 		{
 			auto_unlock = true;
-			args++;
-			argc--;
-			command_print(cmd_ctx, "auto unlock enabled");
+			CMD_ARGV++;
+			CMD_ARGC--;
+			command_print(CMD_CTX, "auto unlock enabled");
 		} else
 		{
 			break;
 		}
 	}
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
@@ -665,10 +688,10 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 	struct duration bench;
 	duration_start(&bench);
 
-	if (argc >= 2)
+	if (CMD_ARGC >= 2)
 	{
 		image.base_address_set = 1;
-		COMMAND_PARSE_NUMBER(int, args[1], image.base_address);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], image.base_address);
 	}
 	else
 	{
@@ -678,7 +701,7 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 
 	image.start_address_set = 0;
 
-	retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL);
+	retval = image_open(&image, CMD_ARGV[0], (CMD_ARGC == 3) ? CMD_ARGV[2] : NULL);
 	if (retval != ERROR_OK)
 	{
 		return retval;
@@ -693,8 +716,8 @@ COMMAND_HANDLER(handle_flash_write_image_command)
 
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
-		command_print(cmd_ctx, "wrote %" PRIu32 " byte from file %s "
-				"in %fs (%0.3f kb/s)", written, args[0],
+		command_print(CMD_CTX, "wrote %" PRIu32 " byte from file %s "
+				"in %fs (%0.3f kb/s)", written, CMD_ARGV[0],
 				duration_elapsed(&bench), duration_kbps(&bench, written));
 	}
 
@@ -709,24 +732,40 @@ COMMAND_HANDLER(handle_flash_fill_command)
 	uint32_t address;
 	uint32_t pattern;
 	uint32_t count;
-	uint8_t chunk[1024];
-	uint8_t readback[1024];
 	uint32_t wrote = 0;
 	uint32_t cur_size = 0;
 	uint32_t chunk_count;
-	struct target *target = get_current_target(cmd_ctx);
+	struct target *target = get_current_target(CMD_CTX);
 	uint32_t i;
 	uint32_t wordsize;
+	int retval = ERROR_OK;
+
+	static size_t const chunksize = 1024;
+	uint8_t *chunk = malloc(chunksize);
+	if (chunk == NULL)
+		return ERROR_FAIL;
+
+	uint8_t *readback = malloc(chunksize);
+	if (readback == NULL)
+	{
+		free(chunk);
+		return ERROR_FAIL;
+	}
+
+
+	if (CMD_ARGC != 3)
+	{
+		retval = ERROR_COMMAND_SYNTAX_ERROR;
+		goto done;
+	}
 
-	if (argc != 3)
-		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	COMMAND_PARSE_NUMBER(u32, args[0], address);
-	COMMAND_PARSE_NUMBER(u32, args[1], pattern);
-	COMMAND_PARSE_NUMBER(u32, args[2], count);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], pattern);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], count);
 
 	if (count == 0)
-		return ERROR_OK;
+		goto done;
 
 	switch (CMD_NAME[4])
 	{
@@ -740,10 +779,11 @@ COMMAND_HANDLER(handle_flash_fill_command)
 		wordsize = 1;
 		break;
 	default:
-		return ERROR_COMMAND_SYNTAX_ERROR;
+		retval = ERROR_COMMAND_SYNTAX_ERROR;
+		goto done;
 	}
 
-	chunk_count = MIN(count, (1024 / wordsize));
+	chunk_count = MIN(count, (chunksize / wordsize));
 	switch (wordsize)
 	{
 	case 4:
@@ -776,15 +816,22 @@ COMMAND_HANDLER(handle_flash_fill_command)
 		bank = get_flash_bank_by_addr(target, address);
 		if (bank == NULL)
 		{
-			return ERROR_FAIL;
+			retval = ERROR_FAIL;
+			goto done;
 		}
 		err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size);
 		if (err != ERROR_OK)
-			return err;
+		{
+			retval = err;
+			goto done;
+		}
 
 		err = target_read_buffer(target, address + wrote, cur_size, readback);
 		if (err != ERROR_OK)
-			return err;
+		{
+			retval = err;
+			goto done;
+		}
 
 		unsigned i;
 		for (i = 0; i < cur_size; i++)
@@ -793,46 +840,52 @@ COMMAND_HANDLER(handle_flash_fill_command)
 			{
 				LOG_ERROR("Verfication error address 0x%08" PRIx32 ", read back 0x%02x, expected 0x%02x",
 						  address + wrote + i, readback[i], chunk[i]);
-				return ERROR_FAIL;
+				retval = ERROR_FAIL;
+				goto done;
 			}
 		}
 	}
 
 	if (duration_measure(&bench) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32 
+		command_print(CMD_CTX, "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32
 				" in %fs (%0.3f kb/s)", wrote, address,
 				duration_elapsed(&bench), duration_kbps(&bench, wrote));
 	}
-	return ERROR_OK;
+
+	done:
+	free(readback);
+	free(chunk);
+
+	return retval;
 }
 
 COMMAND_HANDLER(handle_flash_write_bank_command)
 {
 	uint32_t offset;
 	uint8_t *buffer;
-	uint32_t buf_cnt;
 	struct fileio fileio;
 
-	if (argc != 3)
+	if (CMD_ARGC != 3)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	struct duration bench;
 	duration_start(&bench);
 
 	struct flash_bank *p;
-	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank_by_num, 0, &p);
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
-	COMMAND_PARSE_NUMBER(u32, args[2], offset);
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], offset);
 
-	if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+	if (fileio_open(&fileio, CMD_ARGV[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
 	{
 		return ERROR_OK;
 	}
 
 	buffer = malloc(fileio.size);
+	size_t buf_cnt;
 	if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK)
 	{
 		free(buffer);
@@ -847,9 +900,9 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 
 	if ((ERROR_OK == retval) && (duration_measure(&bench) == ERROR_OK))
 	{
-		command_print(cmd_ctx, "wrote %lld byte from file %s to flash bank %u"
+		command_print(CMD_CTX, "wrote %zu byte from file %s to flash bank %u"
 				" at offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
-				fileio.size, args[1], p->bank_number, offset,
+				fileio.size, CMD_ARGV[1], p->bank_number, offset,
 				duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
 	}
 
@@ -1059,7 +1112,7 @@ static int flash_write_unlock(struct target *target, struct image *image, uint32
 		/* read sections to the buffer */
 		while (buffer_size < run_size)
 		{
-			uint32_t size_read;
+			size_t size_read;
 
 			size_read = run_size - buffer_size;
 			if (size_read > image->sections[section].size - section_offset)
@@ -1133,10 +1186,10 @@ int flash_write(struct target *target, struct image *image, uint32_t *written, i
 int default_flash_mem_blank_check(struct flash_bank *bank)
 {
 	struct target *target = bank->target;
-	uint8_t buffer[1024];
-	int buffer_size = sizeof(buffer);
+	const int buffer_size = 1024;
 	int i;
 	uint32_t nBytes;
+	int retval = ERROR_OK;
 
 	if (bank->target->state != TARGET_HALTED)
 	{
@@ -1144,6 +1197,8 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
+	uint8_t *buffer = malloc(buffer_size);
+
 	for (i = 0; i < bank->num_sectors; i++)
 	{
 		uint32_t j;
@@ -1152,7 +1207,6 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
 		for (j = 0; j < bank->sectors[i].size; j += buffer_size)
 		{
 			uint32_t chunk;
-			int retval;
 			chunk = buffer_size;
 			if (chunk > (j - bank->sectors[i].size))
 			{
@@ -1161,7 +1215,9 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
 
 			retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer);
 			if (retval != ERROR_OK)
-				return retval;
+			{
+				goto done;
+			}
 
 			for (nBytes = 0; nBytes < chunk; nBytes++)
 			{
@@ -1174,7 +1230,10 @@ int default_flash_mem_blank_check(struct flash_bank *bank)
 		}
 	}
 
-	return ERROR_OK;
+	done:
+	free(buffer);
+
+	return retval;
 }
 
 int default_flash_blank_check(struct flash_bank *bank)
@@ -1217,64 +1276,158 @@ int default_flash_blank_check(struct flash_bank *bank)
 	return ERROR_OK;
 }
 
+static const struct command_registration flash_exec_command_handlers[] = {
+	{
+		.name = "probe",
+		.handler = &handle_flash_probe_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank>",
+		.help = "identify flash bank",
+	},
+	{
+		.name = "info",
+		.handler = &handle_flash_info_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank>",
+		.help = "print bank information",
+	},
+	{
+		.name = "erase_check",
+		.handler = &handle_flash_erase_check_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank>",
+		.help = "check erase state of sectors",
+	},
+	{
+		.name = "protect_check",
+		.handler = &handle_flash_protect_check_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank>",
+		.help = "check protection state of sectors",
+	},
+	{
+		.name = "erase_sector",
+		.handler = &handle_flash_erase_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <first> <last>",
+		.help = "erase sectors",
+	},
+	{
+		.name = "erase_address",
+		.handler = &handle_flash_erase_address_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<address> <length>",
+		.help = "erase address range",
+
+	},
+	{
+		.name = "fillw",
+		.handler = &handle_flash_fill_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <address> <word_pattern> <count>",
+		.help = "fill with pattern (no autoerase)",
+	},
+	{
+		.name = "fillh",
+		.handler = &handle_flash_fill_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <address> <halfword_pattern> <count>",
+		.help = "fill with pattern",
+	},
+	{
+		.name = "fillb",
+		.handler = &handle_flash_fill_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <address> <byte_pattern> <count>",
+		.help = "fill with pattern",
+
+	},
+	{
+		.name = "write_bank",
+		.handler = &handle_flash_write_bank_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <file> <offset>",
+		.help = "write binary data",
+	},
+	{
+		.name = "write_image",
+		.handler = &handle_flash_write_image_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> [erase] [unlock] <file> [offset] [type]",
+		.help = "write an image to flash"
+	},
+	{
+		.name = "protect",
+		.handler = &handle_flash_protect_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <first> <last> <on | off>",
+		.help = "set protection of sectors",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 int flash_init_drivers(struct command_context *cmd_ctx)
 {
-	register_jim(cmd_ctx, "ocd_flash_banks",
-			jim_flash_banks, "return information about the flash banks");
-
 	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>");
+	struct command *parent = command_find_in_context(cmd_ctx, "flash");
+	return register_commands(cmd_ctx, parent, flash_exec_command_handlers);
+}
 
-	return ERROR_OK;
+COMMAND_HANDLER(handle_flash_init_command)
+{
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	static bool flash_initialized = false;
+	if (flash_initialized)
+	{
+		LOG_INFO("'flash init' has already been called");
+		return ERROR_OK;
+	}
+	flash_initialized = true;
+
+	LOG_DEBUG("Initializing flash devices...");
+	return flash_init_drivers(CMD_CTX);
 }
 
+static const struct command_registration flash_config_command_handlers[] = {
+	{
+		.name = "bank",
+		.handler = &handle_flash_bank_command,
+		.mode = COMMAND_CONFIG,
+		.usage = "<name> <driver> <base> <size> "
+			"<chip_width> <bus_width> <target> "
+			"[driver_options ...]",
+		.help = "Define a new bank with the given name, "
+			"using the specified NOR flash driver.",
+	},
+	{
+		.name = "init",
+		.mode = COMMAND_CONFIG,
+		.handler = &handle_flash_init_command,
+		.help = "initialize flash devices",
+	},
+	{
+		.name = "banks",
+		.mode = COMMAND_ANY,
+		.jim_handler = &jim_flash_banks,
+		.help = "return information about the flash banks",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration flash_command_handlers[] = {
+	{
+		.name = "flash",
+		.mode = COMMAND_ANY,
+		.help = "NOR flash command group",
+		.chain = flash_config_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
 int flash_register_commands(struct command_context *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,
-			"flash bank <driver> <base> <size> "
-			"<chip_width> <bus_width> <target> [driver_options ...]");
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, flash_command_handlers);
 }