Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Cortex-M3: minor cleanup
[openocd.git] / src / flash / nand.c
diff --git a/src/flash/nand.c b/src/flash/nand.c
index 87ab48711944e10b80601b35cce3bfc5018680ac..6e450758053743d8658c665c0515b0db4f70d99b 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -52,6 +52,7 @@ 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 imx31_nand_flash_controller;
 
 /* extern nand_flash_controller_t boundary_scan_nand_controller; */
 
@@ -64,6 +65,7 @@ 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
 };
@@ -307,13 +309,14 @@ int nand_init(struct command_context_s *cmd_ctx)
                                                 "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, "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]");
+                                                "<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]");
+                                                "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']");
        }
@@ -518,9 +521,9 @@ int nand_probe(struct nand_device_s *device)
        {
                if (device->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);
+                       device->controller->read_data(device, id_buff + 3);
+                       device->controller->read_data(device, id_buff + 4);
+                       device->controller->read_data(device, id_buff + 5);
                }
                else
                {
@@ -635,7 +638,7 @@ int nand_probe(struct nand_device_s *device)
        return ERROR_OK;
 }
 
-int nand_erase(struct nand_device_s *device, int first_block, int last_block)
+static int nand_erase(struct nand_device_s *device, int first_block, int last_block)
 {
        int i;
        uint32_t page;
@@ -710,8 +713,11 @@ 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",
+                                       (device->blocks[i].is_bad == 1)
+                                               ? "bad " : "",
+                                       i, status);
+                       /* continue; other blocks might still be erasable */
                }
 
                device->blocks[i].is_erased = 1;
@@ -736,7 +742,7 @@ static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8
 
        page = malloc(device->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 page_address;
@@ -773,7 +779,7 @@ static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint
 
        page = malloc(device->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 page_address;
@@ -1073,8 +1079,12 @@ int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char
        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);
        }
@@ -1138,9 +1148,13 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd
                                else
                                        bad_state = " (block condition unknown)";
 
-                               command_print(cmd_ctx, "\t#%i: 0x%8.8x (%dkB) %s%s",
-                                                       j, p->blocks[j].offset, p->blocks[j].size / 1024,
-                                                       erase_state, bad_state);
+                               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);
                        }
                }
                else
@@ -1191,7 +1205,7 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm
        nand_device_t *p;
        int retval;
 
-       if (argc != 3)
+       if (argc != 1 && argc != 3)
        {
                return ERROR_COMMAND_SYNTAX_ERROR;
 
@@ -1204,27 +1218,37 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm
                unsigned long offset;
                unsigned long length;
 
-               offset = strtoul(args[1], &cp, 0);
-               if (*cp || offset == ULONG_MAX || 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)
-               {
-                       return ERROR_INVALID_ARGUMENTS;
+               /* 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;
                }
-               length -= 1;
-               length /= p->erase_size;
 
-               retval = nand_erase(p, offset, offset + length);
+               retval = nand_erase(p, offset, offset + length - 1);
                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);
+                       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)
                {
@@ -1416,7 +1440,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                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);
+                                       nand_calculate_ecc(p, page + i, ecc);
                                        oob[eccpos[j++]] = ecc[0];
                                        oob[eccpos[j++]] = ecc[1];
                                        oob[eccpos[j++]] = ecc[2];
@@ -1433,7 +1457,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                                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);
+                                       nand_calculate_ecc_kw(p, page + i, ecc);
                                        ecc += 10;
                                }
                        }
@@ -1449,7 +1473,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
 
                        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.8x",
+                               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);
@@ -1467,7 +1491,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm
                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.8x in %s",
+               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;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)