X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=1c8c0c87c3cd1639fcf633ac12e8eef11044f76e;hp=79858d63c21c7e116a2f4f2b9f7040c58fba6072;hb=747f8af672026f9778c6272ab48405d93b41acad;hpb=2004f2be410db6510ef491144115c528cd5f4ef1

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 79858d63c2..1c8c0c87c3 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -25,38 +25,32 @@
 #endif
 
 #include "nand.h"
+#include "common.h"
 #include "time_support.h"
 #include "fileio.h"
 
-static int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int nand_read_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
+//static int nand_read_plain(struct nand_device *nand, uint32_t address, uint8_t *data, uint32_t data_size);
 
-static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
-
-static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
-//static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size);
-
-static int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
+static int nand_write_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 
 /* NAND flash controller
  */
-extern nand_flash_controller_t davinci_nand_controller;
-extern nand_flash_controller_t lpc3180_nand_controller;
-extern nand_flash_controller_t orion_nand_controller;
-extern nand_flash_controller_t s3c2410_nand_controller;
-extern nand_flash_controller_t s3c2412_nand_controller;
-extern nand_flash_controller_t s3c2440_nand_controller;
-extern nand_flash_controller_t s3c2443_nand_controller;
-
-/* extern nand_flash_controller_t boundary_scan_nand_controller; */
-
-static nand_flash_controller_t *nand_flash_controllers[] =
+extern struct nand_flash_controller nonce_nand_controller;
+extern struct nand_flash_controller davinci_nand_controller;
+extern struct nand_flash_controller lpc3180_nand_controller;
+extern struct nand_flash_controller orion_nand_controller;
+extern struct nand_flash_controller s3c2410_nand_controller;
+extern struct nand_flash_controller s3c2412_nand_controller;
+extern struct nand_flash_controller s3c2440_nand_controller;
+extern struct nand_flash_controller s3c2443_nand_controller;
+extern struct nand_flash_controller imx31_nand_flash_controller;
+
+/* extern struct nand_flash_controller boundary_scan_nand_controller; */
+
+static struct nand_flash_controller *nand_flash_controllers[] =
 {
+	&nonce_nand_controller,
 	&davinci_nand_controller,
 	&lpc3180_nand_controller,
 	&orion_nand_controller,
@@ -64,13 +58,13 @@ static nand_flash_controller_t *nand_flash_controllers[] =
 	&s3c2412_nand_controller,
 	&s3c2440_nand_controller,
 	&s3c2443_nand_controller,
+ 	&imx31_nand_flash_controller,
 /*	&boundary_scan_nand_controller, */
 	NULL
 };
 
 /* configured NAND devices and NAND Flash command handler */
-static nand_device_t *nand_devices = NULL;
-static command_t *nand_cmd;
+static struct nand_device *nand_devices = NULL;
 
 /*	Chip ID list
  *
@@ -82,7 +76,7 @@ static command_t *nand_cmd;
  *	256	256 Byte page size
  *	512	512 Byte page size
  */
-static nand_info_t nand_flash_ids[] =
+static struct nand_info nand_flash_ids[] =
 {
 	/* start "museum" IDs */
 	{"NAND 1MiB 5V 8-bit",		0x6e, 256, 1, 0x1000, 0},
@@ -162,7 +156,7 @@ static nand_info_t nand_flash_ids[] =
 
 /* Manufacturer ID list
  */
-static nand_manufacturer_t nand_manuf_ids[] =
+static struct nand_manufacturer nand_manuf_ids[] =
 {
 	{0x0, "unknown"},
 	{NAND_MFR_TOSHIBA, "Toshiba"},
@@ -181,7 +175,7 @@ static nand_manufacturer_t nand_manuf_ids[] =
  */
 
 #if 0
-static nand_ecclayout_t nand_oob_8 = {
+static struct nand_ecclayout nand_oob_8 = {
 	.eccbytes = 3,
 	.eccpos = {0, 1, 2},
 	.oobfree = {
@@ -192,7 +186,7 @@ static nand_ecclayout_t nand_oob_8 = {
 };
 #endif
 
-static nand_ecclayout_t nand_oob_16 = {
+static struct nand_ecclayout nand_oob_16 = {
 	.eccbytes = 6,
 	.eccpos = {0, 1, 2, 3, 6, 7},
 	.oobfree = {
@@ -200,7 +194,7 @@ static nand_ecclayout_t nand_oob_16 = {
 		 . length = 8}}
 };
 
-static nand_ecclayout_t nand_oob_64 = {
+static struct nand_ecclayout nand_oob_64 = {
 	.eccbytes = 24,
 	.eccpos = {
 		   40, 41, 42, 43, 44, 45, 46, 47,
@@ -211,119 +205,143 @@ static nand_ecclayout_t nand_oob_64 = {
 		 .length = 38}}
 };
 
-/* nand device <nand_controller> [controller options]
- */
-static int handle_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_list_drivers)
 {
-	int i;
-	int retval;
+	command_print(CMD_CTX, "Available NAND flash controller drivers:");
+	for (unsigned i = 0; nand_flash_controllers[i]; i++)
+		command_print(CMD_CTX, "  %s", nand_flash_controllers[i]->name);
+	return ERROR_OK;
+}
 
-	if (argc < 1)
-	{
-		LOG_WARNING("incomplete flash device nand configuration");
-		return ERROR_FLASH_BANK_INVALID;
+static COMMAND_HELPER(create_nand_device, const char *bank_name,
+		struct nand_flash_controller *controller)
+{
+	if (NULL != controller->commands)
+	{
+		int retval = register_commands(CMD_CTX, NULL,
+				controller->commands);
+		if (ERROR_OK != retval)
+			return retval;
+	}
+	struct nand_device *c = malloc(sizeof(struct nand_device));
+
+	c->name = strdup(bank_name);
+	c->controller = controller;
+	c->controller_priv = NULL;
+	c->manufacturer = NULL;
+	c->device = NULL;
+	c->bus_width = 0;
+	c->address_cycles = 0;
+	c->page_size = 0;
+	c->use_raw = 0;
+	c->next = NULL;
+
+	int retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
+	if (ERROR_OK != retval)
+	{
+		LOG_ERROR("'%s' driver rejected nand flash", controller->name);
+		free(c);
+		return ERROR_OK;
 	}
 
-	for (i = 0; nand_flash_controllers[i]; i++)
-	{
-		nand_device_t *p, *c;
-
-		if (strcmp(args[0], nand_flash_controllers[i]->name) == 0)
-		{
-			/* register flash specific commands */
-			if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
-			{
-				LOG_ERROR("couldn't register '%s' commands", args[0]);
-				return retval;
-			}
-
-			c = malloc(sizeof(nand_device_t));
+	if (nand_devices) {
+		struct nand_device *p = nand_devices;
+		while (p && p->next) p = p->next;
+		p->next = c;
+	} else
+		nand_devices = c;
 
-			c->controller = nand_flash_controllers[i];
-			c->controller_priv = NULL;
-			c->manufacturer = NULL;
-			c->device = NULL;
-			c->bus_width = 0;
-			c->address_cycles = 0;
-			c->page_size = 0;
-			c->use_raw = 0;
-			c->next = NULL;
-
-			if ((retval = nand_flash_controllers[i]->nand_device_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
-			{
-				LOG_ERROR("'%s' driver rejected nand flash", c->controller->name);
-				free(c);
-				return ERROR_OK;
-			}
-
-			/* put NAND device in linked list */
-			if (nand_devices)
-			{
-				/* find last flash device */
-				for (p = nand_devices; p && p->next; p = p->next);
-				if (p)
-					p->next = c;
-			}
-			else
-			{
-				nand_devices = c;
-			}
+	return ERROR_OK;
+}
 
-			return ERROR_OK;
-		}
+COMMAND_HANDLER(handle_nand_device_command)
+{
+	if (CMD_ARGC < 1)
+	{
+		LOG_ERROR("incomplete nand device configuration");
+		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	/* no valid NAND controller was found (i.e. the configuration option,
-	 * didn't match one of the compiled-in controllers)
-	 */
-	LOG_ERROR("No valid NAND flash controller found (%s)", args[0]);
-	LOG_ERROR("compiled-in NAND flash controllers:");
-	for (i = 0; nand_flash_controllers[i]; i++)
+	// save name and increment (for compatibility) with drivers
+	const char *bank_name = *CMD_ARGV++;
+	CMD_ARGC--;
+
+	const char *driver_name = CMD_ARGV[0];
+	for (unsigned i = 0; nand_flash_controllers[i]; i++)
 	{
-		LOG_ERROR("%i: %s", i, nand_flash_controllers[i]->name);
+		struct nand_flash_controller *controller = nand_flash_controllers[i];
+		if (strcmp(driver_name, controller->name) != 0)
+			continue;
+
+		return CALL_COMMAND_HANDLER(create_nand_device,
+				bank_name, controller);
 	}
 
-	return ERROR_OK;
+	LOG_ERROR("No valid NAND flash driver found (%s)", driver_name);
+	return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
 }
 
-int nand_register_commands(struct command_context_s *cmd_ctx)
-{
-	nand_cmd = register_command(cmd_ctx, NULL, "nand", NULL, COMMAND_ANY, "NAND specific commands");
 
-	register_command(cmd_ctx, nand_cmd, "device", handle_nand_device_command, COMMAND_CONFIG, NULL);
+COMMAND_HANDLER(handle_nand_init_command);
 
-	return ERROR_OK;
+static const struct command_registration nand_config_command_handlers[] = {
+	{
+		.name = "device",
+		.handler = &handle_nand_device_command,
+		.mode = COMMAND_CONFIG,
+		.help = "defines a new NAND bank",
+	},
+	{
+		.name = "drivers",
+		.handler = &handle_nand_list_drivers,
+		.mode = COMMAND_ANY,
+		.help = "lists available NAND drivers",
+	},
+	{
+		.name = "init",
+		.mode = COMMAND_CONFIG,
+		.handler = &handle_nand_init_command,
+		.help = "initialize NAND devices",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration nand_command_handlers[] = {
+	{
+		.name = "nand",
+		.mode = COMMAND_ANY,
+		.help = "NAND flash command group",
+		.chain = nand_config_command_handlers,
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+int nand_register_commands(struct command_context *cmd_ctx)
+{
+	return register_commands(cmd_ctx, NULL, nand_command_handlers);
 }
 
-int nand_init(struct command_context_s *cmd_ctx)
+struct nand_device *get_nand_device_by_name(const char *name)
 {
-	if (nand_devices)
-	{
-		register_command(cmd_ctx, nand_cmd, "list", handle_nand_list_command, COMMAND_EXEC,
-						 "list configured NAND flash devices");
-		register_command(cmd_ctx, nand_cmd, "info", handle_nand_info_command, COMMAND_EXEC,
-						 "print info about NAND flash device <num>");
-		register_command(cmd_ctx, nand_cmd, "probe", handle_nand_probe_command, COMMAND_EXEC,
-						 "identify NAND flash device <num>");
-		register_command(cmd_ctx, nand_cmd, "check_bad_blocks", handle_nand_check_bad_blocks_command, COMMAND_EXEC,
-						 "check NAND flash device <num> for bad blocks [<offset> <length>]");
-		register_command(cmd_ctx, nand_cmd, "erase", handle_nand_erase_command, COMMAND_EXEC,
-						 "erase blocks on NAND flash device <num> <offset> <length>");
-		register_command(cmd_ctx, nand_cmd, "dump", handle_nand_dump_command, COMMAND_EXEC,
-						 "dump from NAND flash device <num> <filename> "
-						 "<offset> <length> [oob_raw|oob_only]");
-		register_command(cmd_ctx, nand_cmd, "write", handle_nand_write_command, COMMAND_EXEC,
-						 "write to NAND flash device <num> <filename> <offset> [oob_raw|oob_only|oob_softecc|oob_softecc_kw]");
-		register_command(cmd_ctx, nand_cmd, "raw_access", handle_nand_raw_access_command, COMMAND_EXEC,
-						 "raw access to NAND flash device <num> ['enable'|'disable']");
-	}
+	unsigned requested = get_flash_name_index(name);
+	unsigned found = 0;
 
-	return ERROR_OK;
+	struct nand_device *nand;
+	for (nand = nand_devices; NULL != nand; nand = nand->next)
+	{
+		if (strcmp(nand->name, name) == 0)
+			return nand;
+		if (!flash_driver_name_matches(nand->controller->name, name))
+			continue;
+		if (++found < requested)
+			continue;
+		return nand;
+	}
+	return NULL;
 }
 
-nand_device_t *get_nand_device_by_num(int num)
+struct nand_device *get_nand_device_by_num(int num)
 {
-	nand_device_t *p;
+	struct nand_device *p;
 	int i = 0;
 
 	for (p = nand_devices; p; p = p->next)
@@ -337,77 +355,95 @@ nand_device_t *get_nand_device_by_num(int num)
 	return NULL;
 }
 
-static int nand_build_bbt(struct nand_device_s *device, int first, int last)
+COMMAND_HELPER(nand_command_get_device, unsigned name_index,
+		struct nand_device **nand)
+{
+	const char *str = CMD_ARGV[name_index];
+	*nand = get_nand_device_by_name(str);
+	if (*nand)
+		return ERROR_OK;
+
+	unsigned num;
+	COMMAND_PARSE_NUMBER(uint, str, num);
+	*nand = get_nand_device_by_num(num);
+	if (!*nand) {
+		command_print(CMD_CTX, "NAND flash device '%s' not found", str);
+		return ERROR_INVALID_ARGUMENTS;
+	}
+	return ERROR_OK;
+}
+
+static int nand_build_bbt(struct nand_device *nand, int first, int last)
 {
 	uint32_t page = 0x0;
 	int i;
 	uint8_t oob[6];
 
-	if ((first < 0) || (first >= device->num_blocks))
+	if ((first < 0) || (first >= nand->num_blocks))
 		first = 0;
 
-	if ((last >= device->num_blocks) || (last == -1))
-		last = device->num_blocks - 1;
+	if ((last >= nand->num_blocks) || (last == -1))
+		last = nand->num_blocks - 1;
 
 	for (i = first; i < last; i++)
 	{
-		nand_read_page(device, page, NULL, 0, oob, 6);
+		nand_read_page(nand, page, NULL, 0, oob, 6);
 
-		if (((device->device->options & NAND_BUSWIDTH_16) && ((oob[0] & oob[1]) != 0xff))
-			|| (((device->page_size == 512) && (oob[5] != 0xff)) ||
-				((device->page_size == 2048) && (oob[0] != 0xff))))
+		if (((nand->device->options & NAND_BUSWIDTH_16) && ((oob[0] & oob[1]) != 0xff))
+			|| (((nand->page_size == 512) && (oob[5] != 0xff)) ||
+				((nand->page_size == 2048) && (oob[0] != 0xff))))
 		{
 			LOG_WARNING("bad block: %i", i);
-			device->blocks[i].is_bad = 1;
+			nand->blocks[i].is_bad = 1;
 		}
 		else
 		{
-			device->blocks[i].is_bad = 0;
+			nand->blocks[i].is_bad = 0;
 		}
 
-		page += (device->erase_size / device->page_size);
+		page += (nand->erase_size / nand->page_size);
 	}
 
 	return ERROR_OK;
 }
 
-int nand_read_status(struct nand_device_s *device, uint8_t *status)
+int nand_read_status(struct nand_device *nand, uint8_t *status)
 {
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
 	/* Send read status command */
-	device->controller->command(device, NAND_CMD_STATUS);
+	nand->controller->command(nand, NAND_CMD_STATUS);
 
 	alive_sleep(1);
 
 	/* read status */
-	if (device->device->options & NAND_BUSWIDTH_16)
+	if (nand->device->options & NAND_BUSWIDTH_16)
 	{
 		uint16_t data;
-		device->controller->read_data(device, &data);
+		nand->controller->read_data(nand, &data);
 		*status = data & 0xff;
 	}
 	else
 	{
-		device->controller->read_data(device, status);
+		nand->controller->read_data(nand, status);
 	}
 
 	return ERROR_OK;
 }
 
-static int nand_poll_ready(struct nand_device_s *device, int timeout)
+static int nand_poll_ready(struct nand_device *nand, int timeout)
 {
 	uint8_t status;
 
-	device->controller->command(device, NAND_CMD_STATUS);
+	nand->controller->command(nand, NAND_CMD_STATUS);
 	do {
-		if (device->device->options & NAND_BUSWIDTH_16) {
+		if (nand->device->options & NAND_BUSWIDTH_16) {
 			uint16_t data;
-			device->controller->read_data(device, &data);
+			nand->controller->read_data(nand, &data);
 			status = data & 0xff;
 		} else {
-			device->controller->read_data(device, &status);
+			nand->controller->read_data(nand, &status);
 		}
 		if (status & NAND_STATUS_READY)
 			break;
@@ -417,7 +453,7 @@ static int nand_poll_ready(struct nand_device_s *device, int timeout)
 	return (status & NAND_STATUS_READY) != 0;
 }
 
-int nand_probe(struct nand_device_s *device)
+int nand_probe(struct nand_device *nand)
 {
 	uint8_t manufacturer_id, device_id;
 	uint8_t id_buff[6];
@@ -425,17 +461,17 @@ int nand_probe(struct nand_device_s *device)
 	int i;
 
 	/* clear device data */
-	device->device = NULL;
-	device->manufacturer = NULL;
+	nand->device = NULL;
+	nand->manufacturer = NULL;
 
 	/* clear device parameters */
-	device->bus_width = 0;
-	device->address_cycles = 0;
-	device->page_size = 0;
-	device->erase_size = 0;
+	nand->bus_width = 0;
+	nand->address_cycles = 0;
+	nand->page_size = 0;
+	nand->erase_size = 0;
 
 	/* initialize controller (device parameters are zero, use controller default) */
-	if ((retval = device->controller->init(device) != ERROR_OK))
+	if ((retval = nand->controller->init(nand) != ERROR_OK))
 	{
 		switch (retval)
 		{
@@ -451,23 +487,23 @@ int nand_probe(struct nand_device_s *device)
 		}
 	}
 
-	device->controller->command(device, NAND_CMD_RESET);
-	device->controller->reset(device);
+	nand->controller->command(nand, NAND_CMD_RESET);
+	nand->controller->reset(nand);
 
-	device->controller->command(device, NAND_CMD_READID);
-	device->controller->address(device, 0x0);
+	nand->controller->command(nand, NAND_CMD_READID);
+	nand->controller->address(nand, 0x0);
 
-	if (device->bus_width == 8)
+	if (nand->bus_width == 8)
 	{
-		device->controller->read_data(device, &manufacturer_id);
-		device->controller->read_data(device, &device_id);
+		nand->controller->read_data(nand, &manufacturer_id);
+		nand->controller->read_data(nand, &device_id);
 	}
 	else
 	{
 		uint16_t data_buf;
-		device->controller->read_data(device, &data_buf);
+		nand->controller->read_data(nand, &data_buf);
 		manufacturer_id = data_buf & 0xff;
-		device->controller->read_data(device, &data_buf);
+		nand->controller->read_data(nand, &data_buf);
 		device_id = data_buf & 0xff;
 	}
 
@@ -475,7 +511,7 @@ int nand_probe(struct nand_device_s *device)
 	{
 		if (nand_flash_ids[i].id == device_id)
 		{
-			device->device = &nand_flash_ids[i];
+			nand->device = &nand_flash_ids[i];
 			break;
 		}
 	}
@@ -484,127 +520,127 @@ int nand_probe(struct nand_device_s *device)
 	{
 		if (nand_manuf_ids[i].id == manufacturer_id)
 		{
-			device->manufacturer = &nand_manuf_ids[i];
+			nand->manufacturer = &nand_manuf_ids[i];
 			break;
 		}
 	}
 
-	if (!device->manufacturer)
+	if (!nand->manufacturer)
 	{
-		device->manufacturer = &nand_manuf_ids[0];
-		device->manufacturer->id = manufacturer_id;
+		nand->manufacturer = &nand_manuf_ids[0];
+		nand->manufacturer->id = manufacturer_id;
 	}
 
-	if (!device->device)
+	if (!nand->device)
 	{
 		LOG_ERROR("unknown NAND flash device found, manufacturer id: 0x%2.2x device id: 0x%2.2x",
 			manufacturer_id, device_id);
 		return ERROR_NAND_OPERATION_FAILED;
 	}
 
-	LOG_DEBUG("found %s (%s)", device->device->name, device->manufacturer->name);
+	LOG_DEBUG("found %s (%s)", nand->device->name, nand->manufacturer->name);
 
 	/* initialize device parameters */
 
 	/* bus width */
-	if (device->device->options & NAND_BUSWIDTH_16)
-		device->bus_width = 16;
+	if (nand->device->options & NAND_BUSWIDTH_16)
+		nand->bus_width = 16;
 	else
-		device->bus_width = 8;
+		nand->bus_width = 8;
 
 	/* Do we need extended device probe information? */
-	if (device->device->page_size == 0 ||
-	    device->device->erase_size == 0)
+	if (nand->device->page_size == 0 ||
+	    nand->device->erase_size == 0)
 	{
-		if (device->bus_width == 8)
+		if (nand->bus_width == 8)
 		{
-			device->controller->read_data(device, id_buff+3);
-			device->controller->read_data(device, id_buff+4);
-			device->controller->read_data(device, id_buff+5);
+			nand->controller->read_data(nand, id_buff + 3);
+			nand->controller->read_data(nand, id_buff + 4);
+			nand->controller->read_data(nand, id_buff + 5);
 		}
 		else
 		{
 			uint16_t data_buf;
 
-			device->controller->read_data(device, &data_buf);
+			nand->controller->read_data(nand, &data_buf);
 			id_buff[3] = data_buf;
 
-			device->controller->read_data(device, &data_buf);
+			nand->controller->read_data(nand, &data_buf);
 			id_buff[4] = data_buf;
 
-			device->controller->read_data(device, &data_buf);
+			nand->controller->read_data(nand, &data_buf);
 			id_buff[5] = data_buf >> 8;
 		}
 	}
 
 	/* page size */
-	if (device->device->page_size == 0)
+	if (nand->device->page_size == 0)
 	{
-		device->page_size = 1 << (10 + (id_buff[4] & 3));
+		nand->page_size = 1 << (10 + (id_buff[4] & 3));
 	}
-	else if (device->device->page_size == 256)
+	else if (nand->device->page_size == 256)
 	{
 		LOG_ERROR("NAND flashes with 256 byte pagesize are not supported");
 		return ERROR_NAND_OPERATION_FAILED;
 	}
 	else
 	{
-		device->page_size = device->device->page_size;
+		nand->page_size = nand->device->page_size;
 	}
 
 	/* number of address cycles */
-	if (device->page_size <= 512)
+	if (nand->page_size <= 512)
 	{
 		/* small page devices */
-		if (device->device->chip_size <= 32)
-			device->address_cycles = 3;
-		else if (device->device->chip_size <= 8*1024)
-			device->address_cycles = 4;
+		if (nand->device->chip_size <= 32)
+			nand->address_cycles = 3;
+		else if (nand->device->chip_size <= 8*1024)
+			nand->address_cycles = 4;
 		else
 		{
 			LOG_ERROR("BUG: small page NAND device with more than 8 GiB encountered");
-			device->address_cycles = 5;
+			nand->address_cycles = 5;
 		}
 	}
 	else
 	{
 		/* large page devices */
-		if (device->device->chip_size <= 128)
-			device->address_cycles = 4;
-		else if (device->device->chip_size <= 32*1024)
-			device->address_cycles = 5;
+		if (nand->device->chip_size <= 128)
+			nand->address_cycles = 4;
+		else if (nand->device->chip_size <= 32*1024)
+			nand->address_cycles = 5;
 		else
 		{
 			LOG_ERROR("BUG: large page NAND device with more than 32 GiB encountered");
-			device->address_cycles = 6;
+			nand->address_cycles = 6;
 		}
 	}
 
 	/* erase size */
-	if (device->device->erase_size == 0)
+	if (nand->device->erase_size == 0)
 	{
 		switch ((id_buff[4] >> 4) & 3) {
 		case 0:
-			device->erase_size = 64 << 10;
+			nand->erase_size = 64 << 10;
 			break;
 		case 1:
-			device->erase_size = 128 << 10;
+			nand->erase_size = 128 << 10;
 			break;
 		case 2:
-			device->erase_size = 256 << 10;
+			nand->erase_size = 256 << 10;
 			break;
 		case 3:
-			device->erase_size =512 << 10;
+			nand->erase_size =512 << 10;
 			break;
 		}
 	}
 	else
 	{
-		device->erase_size = device->device->erase_size;
+		nand->erase_size = nand->device->erase_size;
 	}
 
 	/* initialize controller, but leave parameters at the controllers default */
-	if ((retval = device->controller->init(device) != ERROR_OK))
+	if ((retval = nand->controller->init(nand) != ERROR_OK))
 	{
 		switch (retval)
 		{
@@ -613,7 +649,7 @@ int nand_probe(struct nand_device_s *device)
 				return ERROR_NAND_OPERATION_FAILED;
 			case ERROR_NAND_OPERATION_NOT_SUPPORTED:
 				LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)",
-					device->bus_width, device->address_cycles, device->page_size);
+					nand->bus_width, nand->address_cycles, nand->page_size);
 				return ERROR_NAND_OPERATION_FAILED;
 			default:
 				LOG_ERROR("BUG: unknown controller initialization failure");
@@ -621,39 +657,39 @@ int nand_probe(struct nand_device_s *device)
 		}
 	}
 
-	device->num_blocks = (device->device->chip_size * 1024) / (device->erase_size / 1024);
-	device->blocks = malloc(sizeof(nand_block_t) * device->num_blocks);
+	nand->num_blocks = (nand->device->chip_size * 1024) / (nand->erase_size / 1024);
+	nand->blocks = malloc(sizeof(struct nand_block) * nand->num_blocks);
 
-	for (i = 0; i < device->num_blocks; i++)
+	for (i = 0; i < nand->num_blocks; i++)
 	{
-		device->blocks[i].size = device->erase_size;
-		device->blocks[i].offset = i * device->erase_size;
-		device->blocks[i].is_erased = -1;
-		device->blocks[i].is_bad = -1;
+		nand->blocks[i].size = nand->erase_size;
+		nand->blocks[i].offset = i * nand->erase_size;
+		nand->blocks[i].is_erased = -1;
+		nand->blocks[i].is_bad = -1;
 	}
 
 	return ERROR_OK;
 }
 
-int nand_erase(struct nand_device_s *device, int first_block, int last_block)
+static int nand_erase(struct nand_device *nand, int first_block, int last_block)
 {
 	int i;
 	uint32_t page;
 	uint8_t status;
 	int retval;
 
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	if ((first_block < 0) || (last_block > device->num_blocks))
+	if ((first_block < 0) || (last_block > nand->num_blocks))
 		return ERROR_INVALID_ARGUMENTS;
 
 	/* make sure we know if a block is bad before erasing it */
 	for (i = first_block; i <= last_block; i++)
 	{
-		if (device->blocks[i].is_bad == -1)
+		if (nand->blocks[i].is_bad == -1)
 		{
-			nand_build_bbt(device, i, last_block);
+			nand_build_bbt(nand, i, last_block);
 			break;
 		}
 	}
@@ -661,48 +697,48 @@ int nand_erase(struct nand_device_s *device, int first_block, int last_block)
 	for (i = first_block; i <= last_block; i++)
 	{
 		/* Send erase setup command */
-		device->controller->command(device, NAND_CMD_ERASE1);
+		nand->controller->command(nand, NAND_CMD_ERASE1);
 
-		page = i * (device->erase_size / device->page_size);
+		page = i * (nand->erase_size / nand->page_size);
 
 		/* Send page address */
-		if (device->page_size <= 512)
+		if (nand->page_size <= 512)
 		{
 			/* row */
-			device->controller->address(device, page & 0xff);
-			device->controller->address(device, (page >> 8) & 0xff);
+			nand->controller->address(nand, page & 0xff);
+			nand->controller->address(nand, (page >> 8) & 0xff);
 
 			/* 3rd cycle only on devices with more than 32 MiB */
-			if (device->address_cycles >= 4)
-				device->controller->address(device, (page >> 16) & 0xff);
+			if (nand->address_cycles >= 4)
+				nand->controller->address(nand, (page >> 16) & 0xff);
 
 			/* 4th cycle only on devices with more than 8 GiB */
-			if (device->address_cycles >= 5)
-				device->controller->address(device, (page >> 24) & 0xff);
+			if (nand->address_cycles >= 5)
+				nand->controller->address(nand, (page >> 24) & 0xff);
 		}
 		else
 		{
 			/* row */
-			device->controller->address(device, page & 0xff);
-			device->controller->address(device, (page >> 8) & 0xff);
+			nand->controller->address(nand, page & 0xff);
+			nand->controller->address(nand, (page >> 8) & 0xff);
 
 			/* 3rd cycle only on devices with more than 128 MiB */
-			if (device->address_cycles >= 5)
-				device->controller->address(device, (page >> 16) & 0xff);
+			if (nand->address_cycles >= 5)
+				nand->controller->address(nand, (page >> 16) & 0xff);
 		}
 
 		/* Send erase confirm command */
-		device->controller->command(device, NAND_CMD_ERASE2);
+		nand->controller->command(nand, NAND_CMD_ERASE2);
 
-		retval = device->controller->nand_ready ?
-				device->controller->nand_ready(device, 1000) :
-				nand_poll_ready(device, 1000);
+		retval = nand->controller->nand_ready ?
+				nand->controller->nand_ready(nand, 1000) :
+				nand_poll_ready(nand, 1000);
 		if (!retval) {
 			LOG_ERROR("timeout waiting for NAND flash block erase to complete");
 			return ERROR_NAND_OPERATION_TIMEOUT;
 		}
 
-		if ((retval = nand_read_status(device, &status)) != ERROR_OK)
+		if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
 		{
 			LOG_ERROR("couldn't read status");
 			return ERROR_NAND_OPERATION_FAILED;
@@ -710,41 +746,44 @@ int nand_erase(struct nand_device_s *device, int first_block, int last_block)
 
 		if (status & 0x1)
 		{
-			LOG_ERROR("erase operation didn't pass, status: 0x%2.2x", status);
-			return ERROR_NAND_OPERATION_FAILED;
+			LOG_ERROR("didn't erase %sblock %d; status: 0x%2.2x",
+					(nand->blocks[i].is_bad == 1)
+						? "bad " : "",
+					i, status);
+			/* continue; other blocks might still be erasable */
 		}
 
-		device->blocks[i].is_erased = 1;
+		nand->blocks[i].is_erased = 1;
 	}
 
 	return ERROR_OK;
 }
 
 #if 0
-static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size)
+static int nand_read_plain(struct nand_device *nand, uint32_t address, uint8_t *data, uint32_t data_size)
 {
 	uint8_t *page;
 
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	if (address % device->page_size)
+	if (address % nand->page_size)
 	{
 		LOG_ERROR("reads need to be page aligned");
 		return ERROR_NAND_OPERATION_FAILED;
 	}
 
-	page = malloc(device->page_size);
+	page = malloc(nand->page_size);
 
-	while (data_size > 0 )
+	while (data_size > 0)
 	{
-		uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
+		uint32_t thisrun_size = (data_size > nand->page_size) ? nand->page_size : data_size;
 		uint32_t page_address;
 
 
-		page_address = address / device->page_size;
+		page_address = address / nand->page_size;
 
-		nand_read_page(device, page_address, page, device->page_size, NULL, 0);
+		nand_read_page(nand, page_address, page, nand->page_size, NULL, 0);
 
 		memcpy(data, page, thisrun_size);
 
@@ -758,32 +797,32 @@ static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8
 	return ERROR_OK;
 }
 
-static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size)
+static int nand_write_plain(struct nand_device *nand, uint32_t address, uint8_t *data, uint32_t data_size)
 {
 	uint8_t *page;
 
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	if (address % device->page_size)
+	if (address % nand->page_size)
 	{
 		LOG_ERROR("writes need to be page aligned");
 		return ERROR_NAND_OPERATION_FAILED;
 	}
 
-	page = malloc(device->page_size);
+	page = malloc(nand->page_size);
 
-	while (data_size > 0 )
+	while (data_size > 0)
 	{
-		uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size;
+		uint32_t thisrun_size = (data_size > nand->page_size) ? nand->page_size : data_size;
 		uint32_t page_address;
 
-		memset(page, 0xff, device->page_size);
+		memset(page, 0xff, nand->page_size);
 		memcpy(page, data, thisrun_size);
 
-		page_address = address / device->page_size;
+		page_address = address / nand->page_size;
 
-		nand_write_page(device, page_address, page, device->page_size, NULL, 0);
+		nand_write_page(nand, page_address, page, nand->page_size, NULL, 0);
 
 		address += thisrun_size;
 		data += thisrun_size;
@@ -796,92 +835,92 @@ static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint
 }
 #endif
 
-int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
+int nand_write_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
 	uint32_t block;
 
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	block = page / (device->erase_size / device->page_size);
-	if (device->blocks[block].is_erased == 1)
-		device->blocks[block].is_erased = 0;
+	block = page / (nand->erase_size / nand->page_size);
+	if (nand->blocks[block].is_erased == 1)
+		nand->blocks[block].is_erased = 0;
 
-	if (device->use_raw || device->controller->write_page == NULL)
-		return nand_write_page_raw(device, page, data, data_size, oob, oob_size);
+	if (nand->use_raw || nand->controller->write_page == NULL)
+		return nand_write_page_raw(nand, page, data, data_size, oob, oob_size);
 	else
-		return device->controller->write_page(device, page, data, data_size, oob, oob_size);
+		return nand->controller->write_page(nand, page, data, data_size, oob, oob_size);
 }
 
-static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
+static int nand_read_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	if (device->use_raw || device->controller->read_page == NULL)
-		return nand_read_page_raw(device, page, data, data_size, oob, oob_size);
+	if (nand->use_raw || nand->controller->read_page == NULL)
+		return nand_read_page_raw(nand, page, data, data_size, oob, oob_size);
 	else
-		return device->controller->read_page(device, page, data, data_size, oob, oob_size);
+		return nand->controller->read_page(nand, page, data, data_size, oob, oob_size);
 }
 
-int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
+int nand_read_page_raw(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
 	uint32_t i;
 
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	if (device->page_size <= 512)
+	if (nand->page_size <= 512)
 	{
 		/* small page device */
 		if (data)
-			device->controller->command(device, NAND_CMD_READ0);
+			nand->controller->command(nand, NAND_CMD_READ0);
 		else
-			device->controller->command(device, NAND_CMD_READOOB);
+			nand->controller->command(nand, NAND_CMD_READOOB);
 
 		/* column (always 0, we start at the beginning of a page/OOB area) */
-		device->controller->address(device, 0x0);
+		nand->controller->address(nand, 0x0);
 
 		/* row */
-		device->controller->address(device, page & 0xff);
-		device->controller->address(device, (page >> 8) & 0xff);
+		nand->controller->address(nand, page & 0xff);
+		nand->controller->address(nand, (page >> 8) & 0xff);
 
 		/* 4th cycle only on devices with more than 32 MiB */
-		if (device->address_cycles >= 4)
-			device->controller->address(device, (page >> 16) & 0xff);
+		if (nand->address_cycles >= 4)
+			nand->controller->address(nand, (page >> 16) & 0xff);
 
 		/* 5th cycle only on devices with more than 8 GiB */
-		if (device->address_cycles >= 5)
-			device->controller->address(device, (page >> 24) & 0xff);
+		if (nand->address_cycles >= 5)
+			nand->controller->address(nand, (page >> 24) & 0xff);
 	}
 	else
 	{
 		/* large page device */
-		device->controller->command(device, NAND_CMD_READ0);
+		nand->controller->command(nand, NAND_CMD_READ0);
 
 		/* column (0 when we start at the beginning of a page,
 		 * or 2048 for the beginning of OOB area)
 		 */
-		device->controller->address(device, 0x0);
+		nand->controller->address(nand, 0x0);
 		if (data)
-			device->controller->address(device, 0x0);
+			nand->controller->address(nand, 0x0);
 		else
-			device->controller->address(device, 0x8);
+			nand->controller->address(nand, 0x8);
 
 		/* row */
-		device->controller->address(device, page & 0xff);
-		device->controller->address(device, (page >> 8) & 0xff);
+		nand->controller->address(nand, page & 0xff);
+		nand->controller->address(nand, (page >> 8) & 0xff);
 
 		/* 5th cycle only on devices with more than 128 MiB */
-		if (device->address_cycles >= 5)
-			device->controller->address(device, (page >> 16) & 0xff);
+		if (nand->address_cycles >= 5)
+			nand->controller->address(nand, (page >> 16) & 0xff);
 
 		/* large page devices need a start command */
-		device->controller->command(device, NAND_CMD_READSTART);
+		nand->controller->command(nand, NAND_CMD_READSTART);
 	}
 
-	if (device->controller->nand_ready) {
-		if (!device->controller->nand_ready(device, 100))
+	if (nand->controller->nand_ready) {
+		if (!nand->controller->nand_ready(nand, 100))
 			return ERROR_NAND_OPERATION_TIMEOUT;
 	} else {
 		alive_sleep(1);
@@ -889,21 +928,21 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat
 
 	if (data)
 	{
-		if (device->controller->read_block_data != NULL)
-			(device->controller->read_block_data)(device, data, data_size);
+		if (nand->controller->read_block_data != NULL)
+			(nand->controller->read_block_data)(nand, data, data_size);
 		else
 		{
 			for (i = 0; i < data_size;)
 			{
-				if (device->device->options & NAND_BUSWIDTH_16)
+				if (nand->device->options & NAND_BUSWIDTH_16)
 				{
-					device->controller->read_data(device, data);
+					nand->controller->read_data(nand, data);
 					data += 2;
 					i += 2;
 				}
 				else
 				{
-					device->controller->read_data(device, data);
+					nand->controller->read_data(nand, data);
 					data += 1;
 					i += 1;
 				}
@@ -913,21 +952,21 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat
 
 	if (oob)
 	{
-		if (device->controller->read_block_data != NULL)
-			(device->controller->read_block_data)(device, oob, oob_size);
+		if (nand->controller->read_block_data != NULL)
+			(nand->controller->read_block_data)(nand, oob, oob_size);
 		else
 		{
 			for (i = 0; i < oob_size;)
 			{
-				if (device->device->options & NAND_BUSWIDTH_16)
+				if (nand->device->options & NAND_BUSWIDTH_16)
 				{
-					device->controller->read_data(device, oob);
+					nand->controller->read_data(nand, oob);
 					oob += 2;
 					i += 2;
 				}
 				else
 				{
-					device->controller->read_data(device, oob);
+					nand->controller->read_data(nand, oob);
 					oob += 1;
 					i += 1;
 				}
@@ -938,72 +977,72 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat
 	return ERROR_OK;
 }
 
-int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
+int nand_write_page_raw(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
 {
 	uint32_t i;
 	int retval;
 	uint8_t status;
 
-	if (!device->device)
+	if (!nand->device)
 		return ERROR_NAND_DEVICE_NOT_PROBED;
 
-	device->controller->command(device, NAND_CMD_SEQIN);
+	nand->controller->command(nand, NAND_CMD_SEQIN);
 
-	if (device->page_size <= 512)
+	if (nand->page_size <= 512)
 	{
 		/* column (always 0, we start at the beginning of a page/OOB area) */
-		device->controller->address(device, 0x0);
+		nand->controller->address(nand, 0x0);
 
 		/* row */
-		device->controller->address(device, page & 0xff);
-		device->controller->address(device, (page >> 8) & 0xff);
+		nand->controller->address(nand, page & 0xff);
+		nand->controller->address(nand, (page >> 8) & 0xff);
 
 		/* 4th cycle only on devices with more than 32 MiB */
-		if (device->address_cycles >= 4)
-			device->controller->address(device, (page >> 16) & 0xff);
+		if (nand->address_cycles >= 4)
+			nand->controller->address(nand, (page >> 16) & 0xff);
 
 		/* 5th cycle only on devices with more than 8 GiB */
-		if (device->address_cycles >= 5)
-			device->controller->address(device, (page >> 24) & 0xff);
+		if (nand->address_cycles >= 5)
+			nand->controller->address(nand, (page >> 24) & 0xff);
 	}
 	else
 	{
 		/* column (0 when we start at the beginning of a page,
 		 * or 2048 for the beginning of OOB area)
 		 */
-		device->controller->address(device, 0x0);
+		nand->controller->address(nand, 0x0);
 		if (data)
-			device->controller->address(device, 0x0);
+			nand->controller->address(nand, 0x0);
 		else
-			device->controller->address(device, 0x8);
+			nand->controller->address(nand, 0x8);
 
 		/* row */
-		device->controller->address(device, page & 0xff);
-		device->controller->address(device, (page >> 8) & 0xff);
+		nand->controller->address(nand, page & 0xff);
+		nand->controller->address(nand, (page >> 8) & 0xff);
 
 		/* 5th cycle only on devices with more than 128 MiB */
-		if (device->address_cycles >= 5)
-			device->controller->address(device, (page >> 16) & 0xff);
+		if (nand->address_cycles >= 5)
+			nand->controller->address(nand, (page >> 16) & 0xff);
 	}
 
 	if (data)
 	{
-		if (device->controller->write_block_data != NULL)
-			(device->controller->write_block_data)(device, data, data_size);
+		if (nand->controller->write_block_data != NULL)
+			(nand->controller->write_block_data)(nand, data, data_size);
 		else
 		{
 			for (i = 0; i < data_size;)
 			{
-				if (device->device->options & NAND_BUSWIDTH_16)
+				if (nand->device->options & NAND_BUSWIDTH_16)
 				{
 					uint16_t data_buf = le_to_h_u16(data);
-					device->controller->write_data(device, data_buf);
+					nand->controller->write_data(nand, data_buf);
 					data += 2;
 					i += 2;
 				}
 				else
 				{
-					device->controller->write_data(device, *data);
+					nand->controller->write_data(nand, *data);
 					data += 1;
 					i += 1;
 				}
@@ -1013,22 +1052,22 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da
 
 	if (oob)
 	{
-		if (device->controller->write_block_data != NULL)
-			(device->controller->write_block_data)(device, oob, oob_size);
+		if (nand->controller->write_block_data != NULL)
+			(nand->controller->write_block_data)(nand, oob, oob_size);
 		else
 		{
 			for (i = 0; i < oob_size;)
 			{
-				if (device->device->options & NAND_BUSWIDTH_16)
+				if (nand->device->options & NAND_BUSWIDTH_16)
 				{
 					uint16_t oob_buf = le_to_h_u16(data);
-					device->controller->write_data(device, oob_buf);
+					nand->controller->write_data(nand, oob_buf);
 					oob += 2;
 					i += 2;
 				}
 				else
 				{
-					device->controller->write_data(device, *oob);
+					nand->controller->write_data(nand, *oob);
 					oob += 1;
 					i += 1;
 				}
@@ -1036,15 +1075,15 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da
 		}
 	}
 
-	device->controller->command(device, NAND_CMD_PAGEPROG);
+	nand->controller->command(nand, NAND_CMD_PAGEPROG);
 
-	retval = device->controller->nand_ready ?
-			device->controller->nand_ready(device, 100) :
-			nand_poll_ready(device, 100);
+	retval = nand->controller->nand_ready ?
+			nand->controller->nand_ready(nand, 100) :
+			nand_poll_ready(nand, 100);
 	if (!retval)
 		return ERROR_NAND_OPERATION_TIMEOUT;
 
-	if ((retval = nand_read_status(device, &status)) != ERROR_OK)
+	if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
 	{
 		LOG_ERROR("couldn't read status");
 		return ERROR_NAND_OPERATION_FAILED;
@@ -1059,38 +1098,41 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da
 	return ERROR_OK;
 }
 
-int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_list_command)
 {
-	nand_device_t *p;
+	struct nand_device *p;
 	int i;
 
 	if (!nand_devices)
 	{
-		command_print(cmd_ctx, "no NAND flash devices configured");
+		command_print(CMD_CTX, "no NAND flash devices configured");
 		return ERROR_OK;
 	}
 
 	for (p = nand_devices, i = 0; p; p = p->next, i++)
 	{
 		if (p->device)
-			command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
-				i, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
+			command_print(CMD_CTX, "#%i: %s (%s) "
+				"pagesize: %i, buswidth: %i,\n\t"
+				"blocksize: %i, blocks: %i",
+				i, p->device->name, p->manufacturer->name,
+				p->page_size, p->bus_width,
+				p->erase_size, p->num_blocks);
 		else
-			command_print(cmd_ctx, "#%i: not probed", i);
+			command_print(CMD_CTX, "#%i: not probed", i);
 	}
 
 	return ERROR_OK;
 }
 
-static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_info_command)
 {
-	nand_device_t *p;
 	int i = 0;
 	int j = 0;
 	int first = -1;
 	int last = -1;
 
-	switch (argc) {
+	switch (CMD_ARGC) {
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	case 1:
@@ -1098,193 +1140,180 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd
 		last = INT32_MAX;
 		break;
 	case 2:
-		first = last = strtoul(args[1], NULL, 0);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
+		first = last = i;
+		i = 0;
 		break;
 	case 3:
-		first = strtoul(args[1], NULL, 0);
-		last = strtoul(args[2], NULL, 0);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
 		break;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+	struct nand_device *p;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+	if (ERROR_OK != retval)
+		return retval;
+
+	if (NULL == p->device)
 	{
-		if (p->device)
-		{
-			if (first >= p->num_blocks)
-				first = p->num_blocks - 1;
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+		return ERROR_OK;
+	}
 
-			if (last >= p->num_blocks)
-				last = p->num_blocks - 1;
+	if (first >= p->num_blocks)
+		first = p->num_blocks - 1;
 
-			command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
-				i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
+	if (last >= p->num_blocks)
+		last = p->num_blocks - 1;
 
-			for (j = first; j <= last; j++)
-			{
-				char *erase_state, *bad_state;
+	command_print(CMD_CTX, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
+		i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
 
-				if (p->blocks[j].is_erased == 0)
-					erase_state = "not erased";
-				else if (p->blocks[j].is_erased == 1)
-					erase_state = "erased";
-				else
-					erase_state = "erase state unknown";
+	for (j = first; j <= last; j++)
+	{
+		char *erase_state, *bad_state;
 
-				if (p->blocks[j].is_bad == 0)
-					bad_state = "";
-				else if (p->blocks[j].is_bad == 1)
-					bad_state = " (marked bad)";
-				else
-					bad_state = " (block condition unknown)";
-
-				command_print(cmd_ctx, 
-					      "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
-					      j,
-					      p->blocks[j].offset, 
-					      p->blocks[j].size / 1024,
-					      erase_state, 
-					      bad_state);
-			}
-		}
+		if (p->blocks[j].is_erased == 0)
+			erase_state = "not erased";
+		else if (p->blocks[j].is_erased == 1)
+			erase_state = "erased";
 		else
-		{
-			command_print(cmd_ctx, "#%s: not probed", args[0]);
-		}
+			erase_state = "erase state unknown";
+
+		if (p->blocks[j].is_bad == 0)
+			bad_state = "";
+		else if (p->blocks[j].is_bad == 1)
+			bad_state = " (marked bad)";
+		else
+			bad_state = " (block condition unknown)";
+
+		command_print(CMD_CTX,
+			      "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
+			      j,
+			      p->blocks[j].offset,
+			      p->blocks[j].size / 1024,
+			      erase_state,
+			      bad_state);
 	}
 
 	return ERROR_OK;
 }
 
-static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_probe_command)
 {
-	nand_device_t *p;
-	int retval;
-
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+	struct nand_device *p;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+	if (ERROR_OK != retval)
+		return retval;
+
+	if ((retval = nand_probe(p)) == ERROR_OK)
 	{
-		if ((retval = nand_probe(p)) == ERROR_OK)
-		{
-			command_print(cmd_ctx, "NAND flash device '%s' found", p->device->name);
-		}
-		else if (retval == ERROR_NAND_OPERATION_FAILED)
-		{
-			command_print(cmd_ctx, "probing failed for NAND flash device");
-		}
-		else
-		{
-			command_print(cmd_ctx, "unknown error when probing NAND flash device");
-		}
+		command_print(CMD_CTX, "NAND flash device '%s' found", p->device->name);
+	}
+	else if (retval == ERROR_NAND_OPERATION_FAILED)
+	{
+		command_print(CMD_CTX, "probing failed for NAND flash device");
 	}
 	else
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		command_print(CMD_CTX, "unknown error when probing NAND flash device");
 	}
 
 	return ERROR_OK;
 }
 
-static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_erase_command)
 {
-	nand_device_t *p;
-	int retval;
-
-	if (argc != 3)
+	if (CMD_ARGC != 1 && CMD_ARGC != 3)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
-	{
-		char *cp;
-		unsigned long offset;
-		unsigned long length;
+	struct nand_device *p;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-		offset = strtoul(args[1], &cp, 0);
-		if (*cp || offset == ULONG_MAX || offset % p->erase_size)
-		{
+	unsigned long offset;
+	unsigned long length;
+
+	/* erase specified part of the chip; or else everything */
+	if (CMD_ARGC == 3) {
+		unsigned long size = p->erase_size * p->num_blocks;
+
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset);
+		if ((offset % p->erase_size) != 0 || offset >= size)
 			return ERROR_INVALID_ARGUMENTS;
-		}
-		offset /= p->erase_size;
 
-		length = strtoul(args[2], &cp, 0);
-		if (*cp || length == ULONG_MAX || length % p->erase_size)
-		{
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
+		if ((length == 0) || (length % p->erase_size) != 0
+				|| (length + offset) > size)
 			return ERROR_INVALID_ARGUMENTS;
-		}
-		length -= 1;
+
+		offset /= p->erase_size;
 		length /= p->erase_size;
+	} else {
+		offset = 0;
+		length = p->num_blocks;
+	}
 
-		retval = nand_erase(p, offset, offset + length);
-		if (retval == ERROR_OK)
-		{
-			command_print(cmd_ctx, "successfully erased blocks "
-					"%lu to %lu on NAND flash device '%s'",
-					offset, offset + length, p->device->name);
-		}
-		else if (retval == ERROR_NAND_OPERATION_FAILED)
-		{
-			command_print(cmd_ctx, "erase failed");
-		}
-		else
-		{
-			command_print(cmd_ctx, "unknown error when erasing NAND flash device");
-		}
+	retval = nand_erase(p, offset, offset + length - 1);
+	if (retval == ERROR_OK)
+	{
+		command_print(CMD_CTX, "erased blocks %lu to %lu "
+				"on NAND flash device #%s '%s'",
+				offset, offset + length,
+				CMD_ARGV[0], p->device->name);
+	}
+	else if (retval == ERROR_NAND_OPERATION_FAILED)
+	{
+		command_print(CMD_CTX, "erase failed");
 	}
 	else
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		command_print(CMD_CTX, "unknown error when erasing NAND flash device");
 	}
 
 	return ERROR_OK;
 }
 
-int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 {
-	nand_device_t *p;
-	int retval;
 	int first = -1;
 	int last = -1;
 
-	if ((argc < 1) || (argc > 3) || (argc == 2))
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 3) || (CMD_ARGC == 2))
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (!p) {
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds",
-				args[0]);
-		return ERROR_INVALID_ARGUMENTS;
-	}
+	struct nand_device *p;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-	if (argc == 3)
+	if (CMD_ARGC == 3)
 	{
-		char *cp;
 		unsigned long offset;
 		unsigned long length;
 
-		offset = strtoul(args[1], &cp, 0);
-		if (*cp || offset == ULONG_MAX || offset % p->erase_size)
-		{
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset);
+		if (offset % p->erase_size)
 			return ERROR_INVALID_ARGUMENTS;
-		}
 		offset /= p->erase_size;
 
-		length = strtoul(args[2], &cp, 0);
-		if (*cp || length == ULONG_MAX || length % p->erase_size)
-		{
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
+		if (length % p->erase_size)
 			return ERROR_INVALID_ARGUMENTS;
-		}
+
 		length -= 1;
 		length /= p->erase_size;
 
@@ -1295,358 +1324,499 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char
 	retval = nand_build_bbt(p, first, last);
 	if (retval == ERROR_OK)
 	{
-		command_print(cmd_ctx, "checked NAND flash device for bad blocks, "
+		command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
 				"use \"nand info\" command to list blocks");
 	}
 	else if (retval == ERROR_NAND_OPERATION_FAILED)
 	{
-		command_print(cmd_ctx, "error when checking for bad blocks on "
+		command_print(CMD_CTX, "error when checking for bad blocks on "
 				"NAND flash device");
 	}
 	else
 	{
-		command_print(cmd_ctx, "unknown error when checking for bad "
+		command_print(CMD_CTX, "unknown error when checking for bad "
 				"blocks on NAND flash device");
 	}
 
 	return ERROR_OK;
 }
 
-static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
-	uint32_t offset;
-	uint32_t binary_size;
-	uint32_t buf_cnt;
-	enum oob_formats oob_format = NAND_OOB_NONE;
+struct nand_fileio_state {
+	uint32_t address;
+	uint32_t size;
 
-	fileio_t fileio;
+	uint8_t *page;
+	uint32_t page_size;
 
-	duration_t duration;
-	char *duration_text;
+	enum oob_formats oob_format;
+	uint8_t *oob;
+	uint32_t oob_size;
 
-	nand_device_t *p;
+	const int *eccpos;
 
-	if (argc < 3)
-	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
+	bool file_opened;
+	struct fileio fileio;
 
-	}
+	struct duration bench;
+};
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+static void nand_fileio_init(struct nand_fileio_state *state)
+{
+	memset(state, 0, sizeof(*state));
+	state->oob_format = NAND_OOB_NONE;
+}
+
+static int nand_fileio_start(struct command_context *cmd_ctx,
+		struct nand_device *nand, const char *filename, int filemode,
+		struct nand_fileio_state *state)
+{
+	if (state->address % nand->page_size)
 	{
-		uint8_t *page = NULL;
-		uint32_t page_size = 0;
-		uint8_t *oob = NULL;
-		uint32_t oob_size = 0;
-		const int *eccpos = NULL;
+		command_print(cmd_ctx, "only page-aligned addresses are supported");
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	}
 
-		offset = strtoul(args[2], NULL, 0);
+	duration_start(&state->bench);
 
-		if (argc > 3)
+	if (NULL != filename)
+	{
+		int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY);
+		if (ERROR_OK != retval)
 		{
-			int i;
-			for (i = 3; i < argc; i++)
-			{
-				if (!strcmp(args[i], "oob_raw"))
-					oob_format |= NAND_OOB_RAW;
-				else if (!strcmp(args[i], "oob_only"))
-					oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
-				else if (!strcmp(args[i], "oob_softecc"))
-					oob_format |= NAND_OOB_SW_ECC;
-				else if (!strcmp(args[i], "oob_softecc_kw"))
-					oob_format |= NAND_OOB_SW_ECC_KW;
-				else
-				{
-					command_print(cmd_ctx, "unknown option: %s", args[i]);
-					return ERROR_COMMAND_SYNTAX_ERROR;
-				}
-			}
+			const char *msg = (FILEIO_READ == filemode) ? "read" : "write";
+			command_print(cmd_ctx, "failed to open '%s' for %s access",
+					filename, msg);
+			return retval;
 		}
+		state->file_opened = true;
+	}
 
-		duration_start_measure(&duration);
+	if (!(state->oob_format & NAND_OOB_ONLY))
+	{
+		state->page_size = nand->page_size;
+		state->page = malloc(nand->page_size);
+	}
 
-		if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+	if (state->oob_format & (NAND_OOB_RAW | NAND_OOB_SW_ECC | NAND_OOB_SW_ECC_KW))
+	{
+		if (nand->page_size == 512)
 		{
-			return ERROR_OK;
+			state->oob_size = 16;
+			state->eccpos = nand_oob_16.eccpos;
 		}
-
-		buf_cnt = binary_size = fileio.size;
-
-		if (!(oob_format & NAND_OOB_ONLY))
+		else if (nand->page_size == 2048)
 		{
-			page_size = p->page_size;
-			page = malloc(p->page_size);
+			state->oob_size = 64;
+			state->eccpos = nand_oob_64.eccpos;
 		}
+		state->oob = malloc(state->oob_size);
+	}
 
-		if (oob_format & (NAND_OOB_RAW | NAND_OOB_SW_ECC | NAND_OOB_SW_ECC_KW))
-		{
-			if (p->page_size == 512) {
-				oob_size = 16;
-				eccpos = nand_oob_16.eccpos;
-			} else if (p->page_size == 2048) {
-				oob_size = 64;
-				eccpos = nand_oob_64.eccpos;
-			}
-			oob = malloc(oob_size);
-		}
+	return ERROR_OK;
+}
+static int nand_fileio_cleanup(struct nand_fileio_state *state)
+{
+	if (state->file_opened)
+		fileio_close(&state->fileio);
 
-		if (offset % p->page_size)
-		{
-			command_print(cmd_ctx, "only page size aligned offsets and sizes are supported");
-			fileio_close(&fileio);
-			free(oob);
-			free(page);
-			return ERROR_OK;
-		}
+	if (state->oob)
+	{
+		free(state->oob);
+		state->oob = NULL;
+	}
+	if (state->page)
+	{
+		free(state->page);
+		state->page = NULL;
+	}
+	return ERROR_OK;
+}
+static int nand_fileio_finish(struct nand_fileio_state *state)
+{
+	nand_fileio_cleanup(state);
+	return duration_measure(&state->bench);
+}
 
-		while (buf_cnt > 0)
-		{
-			uint32_t size_read;
+static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
+		struct nand_device **dev, enum fileio_access filemode,
+		bool need_size, bool sw_ecc)
+{
+	nand_fileio_init(state);
 
-			if (NULL != page)
-			{
-				fileio_read(&fileio, page_size, page, &size_read);
-				buf_cnt -= size_read;
-				if (size_read < page_size)
-				{
-					memset(page + size_read, 0xff, page_size - size_read);
-				}
-			}
+	unsigned minargs = need_size ? 4 : 3;
+	if (CMD_ARGC < minargs)
+		return ERROR_COMMAND_SYNTAX_ERROR;
 
-			if (oob_format & NAND_OOB_SW_ECC)
-			{
-				uint32_t i, j;
-				uint8_t ecc[3];
-				memset(oob, 0xff, oob_size);
-				for (i = 0, j = 0; i < page_size; i += 256) {
-					nand_calculate_ecc(p, page+i, ecc);
-					oob[eccpos[j++]] = ecc[0];
-					oob[eccpos[j++]] = ecc[1];
-					oob[eccpos[j++]] = ecc[2];
-				}
-			} else if (oob_format & NAND_OOB_SW_ECC_KW)
-			{
-				/*
-				 * In this case eccpos is not used as
-				 * the ECC data is always stored contigously
-				 * at the end of the OOB area.  It consists
-				 * of 10 bytes per 512-byte data block.
-				 */
-				uint32_t i;
-				uint8_t *ecc = oob + oob_size - page_size/512 * 10;
-				memset(oob, 0xff, oob_size);
-				for (i = 0; i < page_size; i += 512) {
-					nand_calculate_ecc_kw(p, page+i, ecc);
-					ecc += 10;
-				}
-			}
-			else if (NULL != oob)
+	struct nand_device *nand;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &nand);
+	if (ERROR_OK != retval)
+		return retval;
+
+	if (NULL == nand->device)
+	{
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+		return ERROR_OK;
+	}
+
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
+	if (need_size)
+	{
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
+			if (state->size % nand->page_size)
 			{
-				fileio_read(&fileio, oob_size, oob, &size_read);
-				buf_cnt -= size_read;
-				if (size_read < oob_size)
-				{
-					memset(oob + size_read, 0xff, oob_size - size_read);
-				}
+				command_print(CMD_CTX, "only page-aligned sizes are supported");
+				return ERROR_COMMAND_SYNTAX_ERROR;
 			}
+	}
 
-			if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK)
+	if (CMD_ARGC > minargs)
+	{
+		for (unsigned i = minargs; i < CMD_ARGC; i++)
+		{
+			if (!strcmp(CMD_ARGV[i], "oob_raw"))
+				state->oob_format |= NAND_OOB_RAW;
+			else if (!strcmp(CMD_ARGV[i], "oob_only"))
+				state->oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
+			else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc"))
+				state->oob_format |= NAND_OOB_SW_ECC;
+			else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc_kw"))
+				state->oob_format |= NAND_OOB_SW_ECC_KW;
+			else
 			{
-				command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8" PRIx32 "",
-					args[1], args[0], offset);
-
-				fileio_close(&fileio);
-				free(oob);
-				free(page);
-
-				return ERROR_OK;
+				command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
+				return ERROR_COMMAND_SYNTAX_ERROR;
 			}
-			offset += page_size;
 		}
-
-		fileio_close(&fileio);
-		free(oob);
-		free(page);
-		oob = NULL;
-		page = NULL;
-		duration_stop_measure(&duration, &duration_text);
-		command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8" PRIx32 " in %s",
-			args[1], args[0], offset, duration_text);
-		free(duration_text);
-		duration_text = NULL;
-	}
-	else
-	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
 	}
 
+	retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state);
+	if (ERROR_OK != retval)
+		return retval;
+
+	if (!need_size)
+		state->size = state->fileio.size;
+
+	*dev = nand;
+
 	return ERROR_OK;
 }
 
-static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+/**
+ * @returns If no error occurred, returns number of bytes consumed;
+ * otherwise, returns a negative error code.)
+ */
+static int nand_fileio_read(struct nand_device *nand,
+		struct nand_fileio_state *s)
 {
-	nand_device_t *p;
+	size_t total_read = 0;
+	size_t one_read;
 
-	if (argc < 4)
+	if (NULL != s->page)
 	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
+		fileio_read(&s->fileio, s->page_size, s->page, &one_read);
+		if (one_read < s->page_size)
+			memset(s->page + one_read, 0xff, s->page_size - one_read);
+		total_read += one_read;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+	if (s->oob_format & NAND_OOB_SW_ECC)
 	{
-		if (p->device)
+		uint8_t ecc[3];
+		memset(s->oob, 0xff, s->oob_size);
+		for (uint32_t i = 0, j = 0; i < s->page_size; i += 256)
 		{
-			fileio_t fileio;
-			duration_t duration;
-			char *duration_text;
-			int retval;
-
-			uint8_t *page = NULL;
-			uint32_t page_size = 0;
-			uint8_t *oob = NULL;
-			uint32_t oob_size = 0;
-			uint32_t address = strtoul(args[2], NULL, 0);
-			uint32_t size = strtoul(args[3], NULL, 0);
-			uint32_t bytes_done = 0;
-			enum oob_formats oob_format = NAND_OOB_NONE;
-
-			if (argc > 4)
-			{
-				int i;
-				for (i = 4; i < argc; i++)
-				{
-					if (!strcmp(args[i], "oob_raw"))
-						oob_format |= NAND_OOB_RAW;
-					else if (!strcmp(args[i], "oob_only"))
-						oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
-					else
-						command_print(cmd_ctx, "unknown option: '%s'", args[i]);
-				}
-			}
-
-			if ((address % p->page_size) || (size % p->page_size))
-			{
-				command_print(cmd_ctx, "only page size aligned addresses and sizes are supported");
-				return ERROR_OK;
-			}
+			nand_calculate_ecc(nand, s->page + i, ecc);
+			s->oob[s->eccpos[j++]] = ecc[0];
+			s->oob[s->eccpos[j++]] = ecc[1];
+			s->oob[s->eccpos[j++]] = ecc[2];
+		}
+	}
+	else if (s->oob_format & NAND_OOB_SW_ECC_KW)
+	{
+		/*
+		 * In this case eccpos is not used as
+		 * the ECC data is always stored contigously
+		 * at the end of the OOB area.  It consists
+		 * of 10 bytes per 512-byte data block.
+		 */
+		uint8_t *ecc = s->oob + s->oob_size - s->page_size / 512 * 10;
+		memset(s->oob, 0xff, s->oob_size);
+		for (uint32_t i = 0; i < s->page_size; i += 512)
+		{
+			nand_calculate_ecc_kw(nand, s->page + i, ecc);
+			ecc += 10;
+		}
+	}
+	else if (NULL != s->oob)
+	{
+		fileio_read(&s->fileio, s->oob_size, s->oob, &one_read);
+		if (one_read < s->oob_size)
+			memset(s->oob + one_read, 0xff, s->oob_size - one_read);
+		total_read += one_read;
+	}
+	return total_read;
+}
 
-			if (!(oob_format & NAND_OOB_ONLY))
-			{
-				page_size = p->page_size;
-				page = malloc(p->page_size);
-			}
+COMMAND_HANDLER(handle_nand_write_command)
+{
+	struct nand_device *nand = NULL;
+	struct nand_fileio_state s;
+	int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
+			&s, &nand, FILEIO_READ, false, true);
+	if (ERROR_OK != retval)
+		return retval;
+
+	uint32_t total_bytes = s.size;
+	while (s.size > 0)
+	{
+		int bytes_read = nand_fileio_read(nand, &s);
+		if (bytes_read <= 0)
+		{
+			command_print(CMD_CTX, "error while reading file");
+			return nand_fileio_cleanup(&s);
+		}
+		s.size -= bytes_read;
 
-			if (oob_format & NAND_OOB_RAW)
-			{
-				if (p->page_size == 512)
-					oob_size = 16;
-				else if (p->page_size == 2048)
-					oob_size = 64;
-				oob = malloc(oob_size);
-			}
+		retval = nand_write_page(nand, s.address / nand->page_size,
+				s.page, s.page_size, s.oob, s.oob_size);
+		if (ERROR_OK != retval)
+		{
+			command_print(CMD_CTX, "failed writing file %s "
+				"to NAND flash %s at offset 0x%8.8" PRIx32,
+				CMD_ARGV[1], CMD_ARGV[0], s.address);
+			return nand_fileio_cleanup(&s);
+		}
+		s.address += s.page_size;
+	}
 
-			if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
-			{
-				return ERROR_OK;
-			}
+	if (nand_fileio_finish(&s))
+	{
+		command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
+				"offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+				CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
+				duration_kbps(&s.bench, total_bytes));
+	}
+	return ERROR_OK;
+}
 
-			duration_start_measure(&duration);
+COMMAND_HANDLER(handle_nand_verify_command)
+{
+	struct nand_device *nand = NULL;
+	struct nand_fileio_state file;
+	int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
+			&file, &nand, FILEIO_READ, false, true);
+	if (ERROR_OK != retval)
+		return retval;
+
+	struct nand_fileio_state dev;
+	nand_fileio_init(&dev);
+	dev.address = file.address;
+	dev.size = file.size;
+	dev.oob_format = file.oob_format;
+	retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev);
+	if (ERROR_OK != retval)
+		return retval;
+
+	while (file.size > 0)
+	{
+		int retval = nand_read_page(nand, dev.address / dev.page_size,
+				dev.page, dev.page_size, dev.oob, dev.oob_size);
+		if (ERROR_OK != retval)
+		{
+			command_print(CMD_CTX, "reading NAND flash page failed");
+			nand_fileio_cleanup(&dev);
+			return nand_fileio_cleanup(&file);
+		}
 
-			while (size > 0)
-			{
-				uint32_t size_written;
-				if ((retval = nand_read_page(p, address / p->page_size, page, page_size, oob, oob_size)) != ERROR_OK)
-				{
-					command_print(cmd_ctx, "reading NAND flash page failed");
-					free(page);
-					free(oob);
-					fileio_close(&fileio);
-					return ERROR_OK;
-				}
+		int bytes_read = nand_fileio_read(nand, &file);
+		if (bytes_read <= 0)
+		{
+			command_print(CMD_CTX, "error while reading file");
+			nand_fileio_cleanup(&dev);
+			return nand_fileio_cleanup(&file);
+		}
 
-				if (NULL != page)
-				{
-					fileio_write(&fileio, page_size, page, &size_written);
-					bytes_done += page_size;
-				}
+		if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
+		    (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size)) )
+		{
+			command_print(CMD_CTX, "NAND flash contents differ "
+						"at 0x%8.8" PRIx32, dev.address);
+			nand_fileio_cleanup(&dev);
+			return nand_fileio_cleanup(&file);
+		}
 
-				if (NULL != oob)
-				{
-					fileio_write(&fileio, oob_size, oob, &size_written);
-					bytes_done += oob_size;
-				}
+		file.size -= bytes_read;
+		dev.address += nand->page_size;
+	}
 
-				size -= p->page_size;
-				address += p->page_size;
-			}
+	if (nand_fileio_finish(&file) == ERROR_OK)
+	{
+		command_print(CMD_CTX, "verified file %s in NAND flash %s "
+				"up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+				CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
+				duration_kbps(&file.bench, dev.size));
+	}
 
-			free(page);
-			page = NULL;
-			free(oob);
-			oob = NULL;
-			fileio_close(&fileio);
+	return nand_fileio_cleanup(&dev);
+}
 
-			duration_stop_measure(&duration, &duration_text);
-			command_print(cmd_ctx, "dumped %lld byte in %s", fileio.size, duration_text);
-			free(duration_text);
-			duration_text = NULL;
-		}
-		else
+COMMAND_HANDLER(handle_nand_dump_command)
+{
+	struct nand_device *nand = NULL;
+	struct nand_fileio_state s;
+	int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
+			&s, &nand, FILEIO_WRITE, true, false);
+	if (ERROR_OK != retval)
+		return retval;
+
+	while (s.size > 0)
+	{
+		size_t size_written;
+		int retval = nand_read_page(nand, s.address / nand->page_size,
+				s.page, s.page_size, s.oob, s.oob_size);
+		if (ERROR_OK != retval)
 		{
-			command_print(cmd_ctx, "#%s: not probed", args[0]);
+			command_print(CMD_CTX, "reading NAND flash page failed");
+			return nand_fileio_cleanup(&s);
 		}
+
+		if (NULL != s.page)
+			fileio_write(&s.fileio, s.page_size, s.page, &size_written);
+
+		if (NULL != s.oob)
+			fileio_write(&s.fileio, s.oob_size, s.oob, &size_written);
+
+		s.size -= nand->page_size;
+		s.address += nand->page_size;
 	}
-	else
+
+	if (nand_fileio_finish(&s) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		command_print(CMD_CTX, "dumped %zu bytes in %fs (%0.3f kb/s)", 
+				s.fileio.size, duration_elapsed(&s.bench),
+				duration_kbps(&s.bench, s.fileio.size));
 	}
-
 	return ERROR_OK;
 }
 
-static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_raw_access_command)
 {
-	nand_device_t *p;
-
-	if ((argc < 1) || (argc > 2))
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
-	{
-		if (p->device)
-		{
-			if (argc == 2)
-			{
-				if (strcmp("enable", args[1]) == 0)
-				{
-					p->use_raw = 1;
-				}
-				else if (strcmp("disable", args[1]) == 0)
-				{
-					p->use_raw = 0;
-				}
-				else
-				{
-					return ERROR_COMMAND_SYNTAX_ERROR;
-				}
-			}
+	struct nand_device *p;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-			command_print(cmd_ctx, "raw access is %s", (p->use_raw) ? "enabled" : "disabled");
-		}
-		else
-		{
-			command_print(cmd_ctx, "#%s: not probed", args[0]);
-		}
-	}
-	else
+	if (NULL == p->device)
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+		return ERROR_OK;
 	}
 
+	if (CMD_ARGC == 2)
+		COMMAND_PARSE_ENABLE(CMD_ARGV[1], p->use_raw);
+
+	const char *msg = p->use_raw ? "enabled" : "disabled";
+	command_print(CMD_CTX, "raw access is %s", msg);
+
 	return ERROR_OK;
 }
+
+static const struct command_registration nand_exec_command_handlers[] = {
+	{
+		.name = "list",
+		.handler = &handle_nand_list_command,
+		.mode = COMMAND_EXEC,
+		.help = "list configured NAND flash devices",
+	},
+	{
+		.name = "info",
+		.handler = &handle_nand_info_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank>",
+		.help = "print info about a NAND flash device",
+	},
+	{
+		.name = "probe",
+		.handler = &handle_nand_probe_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank>",
+		.help = "identify NAND flash device <num>",
+
+	},
+	{
+		.name = "check_bad_blocks",
+		.handler = &handle_nand_check_bad_blocks_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> [<offset> <length>]",
+		.help = "check NAND flash device <num> for bad blocks",
+	},
+	{
+		.name = "erase",
+		.handler = &handle_nand_erase_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> [<offset> <length>]",
+		.help = "erase blocks on NAND flash device",
+	},
+	{
+		.name = "dump",
+		.handler = &handle_nand_dump_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <filename> <offset> <length> "
+			"[oob_raw | oob_only]",
+		.help = "dump from NAND flash device",
+	},
+	{
+		.name = "verify",
+		.handler = &handle_nand_verify_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <filename> <offset> "
+			"[oob_raw | oob_only | oob_softecc | oob_softecc_kw]",
+		.help = "verify NAND flash device",
+	},
+	{
+		.name = "write",
+		.handler = &handle_nand_write_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank> <filename> <offset> "
+			"[oob_raw | oob_only | oob_softecc | oob_softecc_kw]",
+		.help = "write to NAND flash device",
+	},
+	{
+		.name = "raw_access",
+		.handler = &handle_nand_raw_access_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<num> ['enable'|'disable']",
+		.help = "raw access to NAND flash device",
+	},
+	COMMAND_REGISTRATION_DONE
+};
+
+int nand_init(struct command_context *cmd_ctx)
+{
+	if (!nand_devices)
+		return ERROR_OK;
+	struct command *parent = command_find_in_context(cmd_ctx, "nand");
+	return register_commands(cmd_ctx, parent, nand_exec_command_handlers);
+}
+
+COMMAND_HANDLER(handle_nand_init_command)
+{
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	static bool nand_initialized = false;
+	if (nand_initialized)
+	{
+		LOG_INFO("'nand init' has already been called");
+		return ERROR_OK;
+	}
+	nand_initialized = true;
+
+	LOG_DEBUG("Initializing NAND devices...");
+	return nand_init(CMD_CTX);
+}