X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=d812805ab1ed885e2d96f3febb2e99d8ba8dd8f2;hp=be3a669a958f5fc92aa90aa109a9298496d95232;hb=870b8c04557f0b7441cc502debaf537984d77e2a;hpb=ef746e27c55c14b7a4f6381c490e5c175e409c0b

diff --git a/src/flash/nand.c b/src/flash/nand.c
index be3a669a95..d812805ab1 100644
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "nand.h"
+#include "common.h"
 #include "time_support.h"
 #include "fileio.h"
 
@@ -210,7 +211,7 @@ COMMAND_HANDLER(handle_nand_device_command)
 	int i;
 	int retval;
 
-	if (argc < 1)
+	if (CMD_ARGC < 1)
 	{
 		LOG_WARNING("incomplete flash device nand configuration");
 		return ERROR_FLASH_BANK_INVALID;
@@ -220,12 +221,12 @@ COMMAND_HANDLER(handle_nand_device_command)
 	{
 		struct nand_device *p, *c;
 
-		if (strcmp(args[0], nand_flash_controllers[i]->name) == 0)
+		if (strcmp(CMD_ARGV[0], nand_flash_controllers[i]->name) == 0)
 		{
 			/* register flash specific commands */
-			if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
+			if ((retval = nand_flash_controllers[i]->register_commands(CMD_CTX)) != ERROR_OK)
 			{
-				LOG_ERROR("couldn't register '%s' commands", args[0]);
+				LOG_ERROR("couldn't register '%s' commands", CMD_ARGV[0]);
 				return retval;
 			}
 
@@ -269,7 +270,7 @@ COMMAND_HANDLER(handle_nand_device_command)
 	/* 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("No valid NAND flash controller found (%s)", CMD_ARGV[0]);
 	LOG_ERROR("compiled-in NAND flash controllers:");
 	for (i = 0; nand_flash_controllers[i]; i++)
 	{
@@ -288,6 +289,23 @@ int nand_register_commands(struct command_context *cmd_ctx)
 	return ERROR_OK;
 }
 
+struct nand_device *get_nand_device_by_name(const char *name)
+{
+	unsigned requested = get_flash_name_index(name);
+	unsigned found = 0;
+
+	struct nand_device *nand;
+	for (nand = nand_devices; NULL != nand; nand = nand->next)
+	{
+		if (!flash_driver_name_matches(nand->controller->name, name))
+			continue;
+		if (++found < requested)
+			continue;
+		return nand;
+	}
+	return NULL;
+}
+
 struct nand_device *get_nand_device_by_num(int num)
 {
 	struct nand_device *p;
@@ -304,14 +322,19 @@ struct nand_device *get_nand_device_by_num(int num)
 	return NULL;
 }
 
-int nand_command_get_device_by_num(struct command_context *cmd_ctx,
-		const char *str, struct nand_device **nand)
+COMMAND_HELPER(nand_command_get_device_by_num, 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' is out of bounds", str);
+		command_print(CMD_CTX, "NAND flash device '%s' not found", str);
 		return ERROR_INVALID_ARGUMENTS;
 	}
 	return ERROR_OK;
@@ -1049,21 +1072,21 @@ COMMAND_HANDLER(handle_nand_list_command)
 
 	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) "
+			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;
@@ -1077,11 +1100,11 @@ COMMAND_HANDLER(handle_nand_info_command)
 	int last = -1;
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
-	switch (argc) {
+	switch (CMD_ARGC) {
 	default:
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	case 1:
@@ -1089,19 +1112,19 @@ COMMAND_HANDLER(handle_nand_info_command)
 		last = INT32_MAX;
 		break;
 	case 2:
-		COMMAND_PARSE_NUMBER(int, args[1], i);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
 		first = last = i;
 		i = 0;
 		break;
 	case 3:
-		COMMAND_PARSE_NUMBER(int, args[1], first);
-		COMMAND_PARSE_NUMBER(int, args[2], last);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
 		break;
 	}
 
 	if (NULL == p->device)
 	{
-		command_print(cmd_ctx, "#%s: not probed", args[0]);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
@@ -1111,7 +1134,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 	if (last >= p->num_blocks)
 		last = p->num_blocks - 1;
 
-	command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
+	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);
 
 	for (j = first; j <= last; j++)
@@ -1132,7 +1155,7 @@ COMMAND_HANDLER(handle_nand_info_command)
 		else
 			bad_state = " (block condition unknown)";
 
-		command_print(cmd_ctx,
+		command_print(CMD_CTX,
 			      "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
 			      j,
 			      p->blocks[j].offset,
@@ -1146,27 +1169,27 @@ COMMAND_HANDLER(handle_nand_info_command)
 
 COMMAND_HANDLER(handle_nand_probe_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
 	if ((retval = nand_probe(p)) == ERROR_OK)
 	{
-		command_print(cmd_ctx, "NAND flash device '%s' found", p->device->name);
+		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");
+		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, "unknown error when probing NAND flash device");
 	}
 
 	return ERROR_OK;
@@ -1174,14 +1197,14 @@ COMMAND_HANDLER(handle_nand_probe_command)
 
 COMMAND_HANDLER(handle_nand_erase_command)
 {
-	if (argc != 1 && argc != 3)
+	if (CMD_ARGC != 1 && CMD_ARGC != 3)
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
@@ -1189,14 +1212,14 @@ COMMAND_HANDLER(handle_nand_erase_command)
 	unsigned long length;
 
 	/* erase specified part of the chip; or else everything */
-	if (argc == 3) {
+	if (CMD_ARGC == 3) {
 		unsigned long size = p->erase_size * p->num_blocks;
 
-		COMMAND_PARSE_NUMBER(ulong, args[1], offset);
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset);
 		if ((offset % p->erase_size) != 0 || offset >= size)
 			return ERROR_INVALID_ARGUMENTS;
 
-		COMMAND_PARSE_NUMBER(ulong, args[2], length);
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
 		if ((length == 0) || (length % p->erase_size) != 0
 				|| (length + offset) > size)
 			return ERROR_INVALID_ARGUMENTS;
@@ -1211,18 +1234,18 @@ COMMAND_HANDLER(handle_nand_erase_command)
 	retval = nand_erase(p, offset, offset + length - 1);
 	if (retval == ERROR_OK)
 	{
-		command_print(cmd_ctx, "erased blocks %lu to %lu "
+		command_print(CMD_CTX, "erased blocks %lu to %lu "
 				"on NAND flash device #%s '%s'",
 				offset, offset + length,
-				args[0], p->device->name);
+				CMD_ARGV[0], p->device->name);
 	}
 	else if (retval == ERROR_NAND_OPERATION_FAILED)
 	{
-		command_print(cmd_ctx, "erase failed");
+		command_print(CMD_CTX, "erase failed");
 	}
 	else
 	{
-		command_print(cmd_ctx, "unknown error when erasing NAND flash device");
+		command_print(CMD_CTX, "unknown error when erasing NAND flash device");
 	}
 
 	return ERROR_OK;
@@ -1233,28 +1256,28 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 	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;
 
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
-	if (argc == 3)
+	if (CMD_ARGC == 3)
 	{
 		unsigned long offset;
 		unsigned long length;
 
-		COMMAND_PARSE_NUMBER(ulong, args[1], offset);
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset);
 		if (offset % p->erase_size)
 			return ERROR_INVALID_ARGUMENTS;
 		offset /= p->erase_size;
 
-		COMMAND_PARSE_NUMBER(ulong, args[2], length);
+		COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
 		if (length % p->erase_size)
 			return ERROR_INVALID_ARGUMENTS;
 
@@ -1268,336 +1291,404 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
 	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;
 }
 
-COMMAND_HANDLER(handle_nand_write_command)
-{
-	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;
+
+	uint8_t *page;
+	uint32_t page_size;
 
+	enum oob_formats oob_format;
+	uint8_t *oob;
+	uint32_t oob_size;
+
+	const int *eccpos;
+
+	bool file_opened;
 	struct fileio fileio;
 
+	struct duration bench;
+};
 
-	if (argc < 3)
+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)
 	{
+		command_print(cmd_ctx, "only page-aligned addresses are supported");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
-	if (ERROR_OK != retval)
-		return retval;
-
-	uint8_t *page = NULL;
-	uint32_t page_size = 0;
-	uint8_t *oob = NULL;
-	uint32_t oob_size = 0;
-	const int *eccpos = NULL;
-
-	COMMAND_PARSE_NUMBER(u32, args[2], offset);
+	duration_start(&state->bench);
 
-	if (argc > 3)
+	if (NULL != filename)
 	{
-		for (unsigned i = 3; i < argc; i++)
+		int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY);
+		if (ERROR_OK != retval)
 		{
-			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;
 	}
 
-	struct duration bench;
-	duration_start(&bench);
+	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))
 	{
-		return ERROR_OK;
+		if (nand->page_size == 512)
+		{
+			state->oob_size = 16;
+			state->eccpos = nand_oob_16.eccpos;
+		}
+		else if (nand->page_size == 2048)
+		{
+			state->oob_size = 64;
+			state->eccpos = nand_oob_64.eccpos;
+		}
+		state->oob = malloc(state->oob_size);
 	}
 
-	buf_cnt = binary_size = fileio.size;
+	return ERROR_OK;
+}
+static int nand_fileio_cleanup(struct nand_fileio_state *state)
+{
+	if (state->file_opened)
+		fileio_close(&state->fileio);
 
-	if (!(oob_format & NAND_OOB_ONLY))
+	if (state->oob)
 	{
-		page_size = p->page_size;
-		page = malloc(p->page_size);
+		free(state->oob);
+		state->oob = NULL;
 	}
-
-	if (oob_format & (NAND_OOB_RAW | NAND_OOB_SW_ECC | NAND_OOB_SW_ECC_KW))
+	if (state->page)
 	{
-		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);
+		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);
+}
+
+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);
+
+	unsigned minargs = need_size ? 4 : 3;
+	if (CMD_ARGC < minargs)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	struct nand_device *nand;
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &nand);
+	if (ERROR_OK != retval)
+		return retval;
 
-	if (offset % p->page_size)
+	if (NULL == nand->device)
 	{
-		command_print(cmd_ctx, "only page size aligned offsets and sizes are supported");
-		fileio_close(&fileio);
-		free(oob);
-		free(page);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
-	while (buf_cnt > 0)
+	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
+	if (need_size)
 	{
-		uint32_t size_read;
-
-		if (NULL != page)
-		{
-			fileio_read(&fileio, page_size, page, &size_read);
-			buf_cnt -= size_read;
-			if (size_read < page_size)
+			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
+			if (state->size % nand->page_size)
 			{
-				memset(page + size_read, 0xff, page_size - size_read);
+				command_print(CMD_CTX, "only page-aligned sizes are supported");
+				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)
+	if (CMD_ARGC > minargs)
+	{
+		for (unsigned i = minargs; i < CMD_ARGC; i++)
 		{
-			fileio_read(&fileio, oob_size, oob, &size_read);
-			buf_cnt -= size_read;
-			if (size_read < oob_size)
+			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
 			{
-				memset(oob + size_read, 0xff, oob_size - size_read);
+				command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
+				return ERROR_COMMAND_SYNTAX_ERROR;
 			}
 		}
+	}
 
-		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);
+	retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state);
+	if (ERROR_OK != retval)
+		return retval;
 
-			return ERROR_OK;
-		}
-		offset += page_size;
-	}
+	if (!need_size)
+		state->size = state->fileio.size;
 
-	fileio_close(&fileio);
-	free(oob);
-	free(page);
-	oob = NULL;
-	page = NULL;
-	if (duration_measure(&bench) == ERROR_OK)
-	{
-		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));
-	}
+	*dev = nand;
 
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(handle_nand_dump_command)
+/**
+ * @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)
 {
-	if (argc < 4)
-	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
+	size_t total_read = 0;
+	size_t one_read;
 
-	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
-	if (ERROR_OK != retval)
-		return retval;
-
-	if (NULL == p->device)
+	if (NULL != s->page)
 	{
-		command_print(cmd_ctx, "#%s: not probed", args[0]);
-		return ERROR_OK;
+		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;
 	}
 
-	struct fileio fileio;
-
-	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 (argc > 4)
+	if (s->oob_format & NAND_OOB_SW_ECC)
 	{
-		for (unsigned i = 4; i < argc; i++)
+		uint8_t ecc[3];
+		memset(s->oob, 0xff, s->oob_size);
+		for (uint32_t i = 0, j = 0; i < s->page_size; i += 256)
 		{
-			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_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];
 		}
 	}
-
-	if ((address % p->page_size) || (size % p->page_size))
+	else if (s->oob_format & NAND_OOB_SW_ECC_KW)
 	{
-		command_print(cmd_ctx, "only page size aligned addresses and sizes are supported");
-		return ERROR_OK;
+		/*
+		 * 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;
+		}
 	}
-
-	if (!(oob_format & NAND_OOB_ONLY))
+	else if (NULL != s->oob)
 	{
-		page_size = p->page_size;
-		page = malloc(p->page_size);
+		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_RAW)
+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)
 	{
-		if (p->page_size == 512)
-			oob_size = 16;
-		else if (p->page_size == 2048)
-			oob_size = 64;
-		oob = malloc(oob_size);
+		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;
+
+		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)
+	if (nand_fileio_finish(&s))
 	{
-		return ERROR_OK;
+		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;
+}
 
-	struct duration bench;
-	duration_start(&bench);
+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 (size > 0)
+	while (file.size > 0)
 	{
-		uint32_t size_written;
-		if ((retval = nand_read_page(p, address / p->page_size, page, page_size, oob, oob_size)) != ERROR_OK)
+		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");
-			free(page);
-			free(oob);
-			fileio_close(&fileio);
-			return ERROR_OK;
+			command_print(CMD_CTX, "reading NAND flash page failed");
+			nand_fileio_cleanup(&dev);
+			return nand_fileio_cleanup(&file);
 		}
 
-		if (NULL != page)
+		int bytes_read = nand_fileio_read(nand, &file);
+		if (bytes_read <= 0)
 		{
-			fileio_write(&fileio, page_size, page, &size_written);
-			bytes_done += page_size;
+			command_print(CMD_CTX, "error while reading file");
+			nand_fileio_cleanup(&dev);
+			return nand_fileio_cleanup(&file);
 		}
 
-		if (NULL != oob)
+		if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
+		    (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size)) )
 		{
-			fileio_write(&fileio, oob_size, oob, &size_written);
-			bytes_done += 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);
 		}
 
-		size -= p->page_size;
-		address += p->page_size;
+		file.size -= bytes_read;
+		file.address += nand->page_size;
 	}
 
-	free(page);
-	page = NULL;
-	free(oob);
-	oob = NULL;
-	fileio_close(&fileio);
+	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));
+	}
 
-	if (duration_measure(&bench) == ERROR_OK)
+	return nand_fileio_cleanup(&dev);
+}
+
+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)
 	{
-		command_print(cmd_ctx, "dumped %lld byte in %fs (%0.3f kb/s)",
-			fileio.size, duration_elapsed(&bench),
-			duration_kbps(&bench, fileio.size));
+		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, "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;
 	}
 
+	if (nand_fileio_finish(&s) == ERROR_OK)
+	{
+		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;
 }
 
 COMMAND_HANDLER(handle_nand_raw_access_command)
 {
-	if ((argc < 1) || (argc > 2))
+	if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
 	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	struct nand_device *p;
-	int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+	int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
 	if (ERROR_OK != retval)
 		return retval;
 
 	if (NULL == p->device)
 	{
-		command_print(cmd_ctx, "#%s: not probed", args[0]);
+		command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
 		return ERROR_OK;
 	}
 
-	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;
-	}
+	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);
+	command_print(CMD_CTX, "raw access is %s", msg);
 
 	return ERROR_OK;
 }
@@ -1627,6 +1718,10 @@ int nand_init(struct command_context *cmd_ctx)
 			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, "verify",
+			&handle_nand_verify_command, COMMAND_EXEC,
+			"verify NAND flash device <num> <filename> <offset> "
+			"[oob_raw | oob_only | oob_softecc | oob_softecc_kw]");
 	register_command(cmd_ctx, nand_cmd, "write",
 			handle_nand_write_command, COMMAND_EXEC,
 			"write to NAND flash device <num> <filename> <offset> "