X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=181700d04f183170e0274f7e17a702c5e66dd9df;hp=6e450758053743d8658c665c0515b0db4f70d99b;hb=cfc4d5c6b7b6f8f82dc5bbf3ee661c179814666e;hpb=9536577c0214d6f59e9589fce75f295755fa9f6c

diff --git a/src/flash/nand.c b/src/flash/nand.c
index 6e45075805..181700d04f 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -28,20 +28,10 @@
 #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_s *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_s *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_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 
 /* NAND flash controller
  */
@@ -215,7 +205,7 @@ static nand_ecclayout_t nand_oob_64 = {
 
 /* 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_device_command)
 {
 	int i;
 	int retval;
@@ -297,33 +287,6 @@ int nand_register_commands(struct command_context_s *cmd_ctx)
 	return ERROR_OK;
 }
 
-int nand_init(struct command_context_s *cmd_ctx)
-{
-	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']");
-	}
-
-	return ERROR_OK;
-}
-
 nand_device_t *get_nand_device_by_num(int num)
 {
 	nand_device_t *p;
@@ -340,77 +303,90 @@ 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)
+int nand_command_get_device_by_num(struct command_context_s *cmd_ctx,
+		const char *str, nand_device_t **nand)
+{
+	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' is out of bounds", str);
+		return ERROR_INVALID_ARGUMENTS;
+	}
+	return ERROR_OK;
+}
+
+static int nand_build_bbt(struct nand_device_s *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_s *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_s *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;
@@ -420,7 +396,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_s *nand)
 {
 	uint8_t manufacturer_id, device_id;
 	uint8_t id_buff[6];
@@ -428,17 +404,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)
 		{
@@ -454,23 +430,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;
 	}
 
@@ -478,7 +454,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;
 		}
 	}
@@ -487,127 +463,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)
 		{
@@ -616,7 +592,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");
@@ -624,39 +600,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(nand_block_t) * 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;
 }
 
-static int nand_erase(struct nand_device_s *device, int first_block, int last_block)
+static int nand_erase(struct nand_device_s *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;
 		}
 	}
@@ -664,48 +640,48 @@ static int nand_erase(struct nand_device_s *device, int first_block, int last_bl
 	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;
@@ -714,43 +690,43 @@ static int nand_erase(struct nand_device_s *device, int first_block, int last_bl
 		if (status & 0x1)
 		{
 			LOG_ERROR("didn't erase %sblock %d; status: 0x%2.2x",
-					(device->blocks[i].is_bad == 1)
+					(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_s *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)
 	{
-		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);
 
@@ -764,32 +740,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_s *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)
 	{
-		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;
@@ -802,92 +778,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_s *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_s *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_s *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);
@@ -895,21 +871,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;
 				}
@@ -919,21 +895,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;
 				}
@@ -944,72 +920,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_s *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;
 				}
@@ -1019,22 +995,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;
 				}
@@ -1042,15 +1018,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;
@@ -1065,7 +1041,7 @@ 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;
 	int i;
@@ -1092,14 +1068,18 @@ int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char
 	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;
 
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
+
 	switch (argc) {
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1108,169 +1088,147 @@ 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, args[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, args[1], first);
+		COMMAND_PARSE_NUMBER(int, args[2], last);
 		break;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+	if (NULL == p->device)
 	{
-		if (p->device)
-		{
-			if (first >= p->num_blocks)
-				first = p->num_blocks - 1;
+		command_print(cmd_ctx, "#%s: not probed", args[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)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[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 != 1 && 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;
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-		/* erase specified part of the chip; or else everything */
-		if (argc == 3) {
-			unsigned long size = p->erase_size * p->num_blocks;
-
-			offset = strtoul(args[1], &cp, 0);
-			if (*cp || (offset == ULONG_MAX)
-					|| (offset % p->erase_size) != 0
-					|| offset >= size)
-				return ERROR_INVALID_ARGUMENTS;
-
-			length = strtoul(args[2], &cp, 0);
-			if (*cp || (length == ULONG_MAX)
-					|| (length == 0)
-					|| (length % p->erase_size) != 0
-					|| (length + offset) > size)
-				return ERROR_INVALID_ARGUMENTS;
-
-			offset /= p->erase_size;
-			length /= p->erase_size;
-		} else {
-			offset = 0;
-			length = p->num_blocks;
-		}
+	unsigned long offset;
+	unsigned long length;
 
-		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,
-					args[0], 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");
-		}
+	/* erase specified part of the chip; or else everything */
+	if (argc == 3) {
+		unsigned long size = p->erase_size * p->num_blocks;
+
+		COMMAND_PARSE_NUMBER(ulong, args[1], offset);
+		if ((offset % p->erase_size) != 0 || offset >= size)
+			return ERROR_INVALID_ARGUMENTS;
+
+		COMMAND_PARSE_NUMBER(ulong, args[2], length);
+		if ((length == 0) || (length % p->erase_size) != 0
+				|| (length + offset) > size)
+			return ERROR_INVALID_ARGUMENTS;
+
+		offset /= p->erase_size;
+		length /= p->erase_size;
+	} else {
+		offset = 0;
+		length = p->num_blocks;
+	}
+
+	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,
+				args[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;
 
@@ -1280,31 +1238,25 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char
 
 	}
 
-	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;
-	}
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
 
 	if (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, args[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, args[2], length);
+		if (length % p->erase_size)
 			return ERROR_INVALID_ARGUMENTS;
-		}
+
 		length -= 1;
 		length /= p->erase_size;
 
@@ -1332,7 +1284,7 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char
 	return ERROR_OK;
 }
 
-static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_write_command)
 {
 	uint32_t offset;
 	uint32_t binary_size;
@@ -1341,332 +1293,349 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
 
 	fileio_t fileio;
 
-	duration_t duration;
-	char *duration_text;
-
-	nand_device_t *p;
 
 	if (argc < 3)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
-	{
-		uint8_t *page = NULL;
-		uint32_t page_size = 0;
-		uint8_t *oob = NULL;
-		uint32_t oob_size = 0;
-		const int *eccpos = NULL;
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-		offset = strtoul(args[2], NULL, 0);
+	uint8_t *page = NULL;
+	uint32_t page_size = 0;
+	uint8_t *oob = NULL;
+	uint32_t oob_size = 0;
+	const int *eccpos = NULL;
 
-		if (argc > 3)
+	COMMAND_PARSE_NUMBER(u32, args[2], offset);
+
+	if (argc > 3)
+	{
+		int i;
+		for (i = 3; i < argc; i++)
 		{
-			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
 			{
-				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;
-				}
+				command_print(cmd_ctx, "unknown option: %s", args[i]);
+				return ERROR_COMMAND_SYNTAX_ERROR;
 			}
 		}
+	}
 
-		duration_start_measure(&duration);
+	struct duration bench;
+	duration_start(&bench);
 
-		if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
-		{
-			return ERROR_OK;
-		}
+	if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+	{
+		return ERROR_OK;
+	}
 
-		buf_cnt = binary_size = fileio.size;
+	buf_cnt = binary_size = fileio.size;
 
-		if (!(oob_format & NAND_OOB_ONLY))
-		{
-			page_size = p->page_size;
-			page = malloc(p->page_size);
-		}
+	if (!(oob_format & NAND_OOB_ONLY))
+	{
+		page_size = p->page_size;
+		page = malloc(p->page_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);
+	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);
+	}
 
-		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 (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;
+	}
 
-		while (buf_cnt > 0)
-		{
-			uint32_t size_read;
+	while (buf_cnt > 0)
+	{
+		uint32_t size_read;
 
-			if (NULL != page)
+		if (NULL != page)
+		{
+			fileio_read(&fileio, page_size, page, &size_read);
+			buf_cnt -= size_read;
+			if (size_read < page_size)
 			{
-				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);
-				}
+				memset(page + size_read, 0xff, page_size - size_read);
 			}
+		}
 
-			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;
-				}
+		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)
+		}
+		else if (NULL != oob)
+		{
+			fileio_read(&fileio, oob_size, oob, &size_read);
+			buf_cnt -= size_read;
+			if (size_read < oob_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);
-				}
+				memset(oob + size_read, 0xff, oob_size - size_read);
 			}
+		}
 
-			if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK)
-			{
-				command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8" PRIx32 "",
-					args[1], args[0], offset);
+		if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK)
+		{
+			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);
+			fileio_close(&fileio);
+			free(oob);
+			free(page);
 
-				return ERROR_OK;
-			}
-			offset += page_size;
+			return ERROR_OK;
 		}
-
-		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;
+		offset += page_size;
 	}
-	else
+
+	fileio_close(&fileio);
+	free(oob);
+	free(page);
+	oob = NULL;
+	page = NULL;
+	if (duration_measure(&bench) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		command_print(cmd_ctx, "wrote file %s to NAND flash %s "
+			"up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+			args[1], args[0], offset, duration_elapsed(&bench),
+			duration_kbps(&bench, fileio.size));
 	}
 
 	return ERROR_OK;
 }
 
-static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_nand_dump_command)
 {
-	nand_device_t *p;
-
 	if (argc < 4)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	p = get_nand_device_by_num(strtoul(args[0], NULL, 0));
-	if (p)
-	{
-		if (p->device)
-		{
-			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]);
-				}
-			}
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	if (ERROR_OK != retval)
+		return retval;
 
-			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;
-			}
+	if (NULL == p->device)
+	{
+		command_print(cmd_ctx, "#%s: not probed", args[0]);
+		return ERROR_OK;
+	}
 
-			if (!(oob_format & NAND_OOB_ONLY))
-			{
-				page_size = p->page_size;
-				page = malloc(p->page_size);
-			}
+	fileio_t fileio;
 
-			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);
-			}
+	uint8_t *page = NULL;
+	uint32_t page_size = 0;
+	uint8_t *oob = NULL;
+	uint32_t oob_size = 0;
+	uint32_t address;
+	COMMAND_PARSE_NUMBER(u32, args[2], address);
+	uint32_t size;
+	COMMAND_PARSE_NUMBER(u32, args[3], size);
+	uint32_t bytes_done = 0;
+	enum oob_formats oob_format = NAND_OOB_NONE;
 
-			if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
-			{
-				return ERROR_OK;
-			}
+	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]);
+		}
+	}
 
-			duration_start_measure(&duration);
+	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;
+	}
 
-			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;
-				}
+	if (!(oob_format & NAND_OOB_ONLY))
+	{
+		page_size = p->page_size;
+		page = malloc(p->page_size);
+	}
 
-				if (NULL != page)
-				{
-					fileio_write(&fileio, page_size, page, &size_written);
-					bytes_done += page_size;
-				}
+	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);
+	}
 
-				if (NULL != oob)
-				{
-					fileio_write(&fileio, oob_size, oob, &size_written);
-					bytes_done += oob_size;
-				}
+	if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
+	{
+		return ERROR_OK;
+	}
 
-				size -= p->page_size;
-				address += p->page_size;
-			}
+	struct duration bench;
+	duration_start(&bench);
 
+	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);
-			page = NULL;
 			free(oob);
-			oob = NULL;
 			fileio_close(&fileio);
+			return ERROR_OK;
+		}
 
-			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;
+		if (NULL != page)
+		{
+			fileio_write(&fileio, page_size, page, &size_written);
+			bytes_done += page_size;
 		}
-		else
+
+		if (NULL != oob)
 		{
-			command_print(cmd_ctx, "#%s: not probed", args[0]);
+			fileio_write(&fileio, oob_size, oob, &size_written);
+			bytes_done += oob_size;
 		}
+
+		size -= p->page_size;
+		address += p->page_size;
 	}
-	else
+
+	free(page);
+	page = NULL;
+	free(oob);
+	oob = NULL;
+	fileio_close(&fileio);
+
+	if (duration_measure(&bench) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		command_print(cmd_ctx, "dumped %lld byte in %fs (%0.3f kb/s)",
+			fileio.size, duration_elapsed(&bench),
+			duration_kbps(&bench, 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))
 	{
 		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;
-				}
-			}
+	nand_device_t *p;
+	int retval = nand_command_get_device_by_num(cmd_ctx, args[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]);
-		}
+	if (NULL == p->device)
+	{
+		command_print(cmd_ctx, "#%s: not probed", args[0]);
+		return ERROR_OK;
 	}
-	else
+
+	if (argc == 2)
 	{
-		command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]);
+		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;
 	}
 
+	const char *msg = p->use_raw ? "enabled" : "disabled";
+	command_print(cmd_ctx, "raw access is %s", msg);
+
+	return ERROR_OK;
+}
+
+int nand_init(struct command_context_s *cmd_ctx)
+{
+	if (!nand_devices)
+		return ERROR_OK;
+
+	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']");
+
 	return ERROR_OK;
 }