nand: factor init to 'nand init'
[openocd.git] / src / flash / nand.c
index 9231b9adaa69b28963346e9e794d56d325d2b70c..1c8c0c87c3cd1639fcf633ac12e8eef11044f76e 100644 (file)
@@ -25,6 +25,7 @@
 #endif
 
 #include "nand.h"
+#include "common.h"
 #include "time_support.h"
 #include "fileio.h"
 
@@ -35,6 +36,7 @@ static int nand_write_page(struct nand_device *nand, uint32_t page, uint8_t *dat
 
 /* NAND flash controller
  */
+extern struct nand_flash_controller nonce_nand_controller;
 extern struct nand_flash_controller davinci_nand_controller;
 extern struct nand_flash_controller lpc3180_nand_controller;
 extern struct nand_flash_controller orion_nand_controller;
@@ -48,6 +50,7 @@ extern struct nand_flash_controller imx31_nand_flash_controller;
 
 static struct nand_flash_controller *nand_flash_controllers[] =
 {
+       &nonce_nand_controller,
        &davinci_nand_controller,
        &lpc3180_nand_controller,
        &orion_nand_controller,
@@ -62,7 +65,6 @@ static struct nand_flash_controller *nand_flash_controllers[] =
 
 /* configured NAND devices and NAND Flash command handler */
 static struct nand_device *nand_devices = NULL;
-static struct command *nand_cmd;
 
 /*     Chip ID list
  *
@@ -203,89 +205,138 @@ static struct nand_ecclayout nand_oob_64 = {
                 .length = 38}}
 };
 
-/* nand device <nand_controller> [controller options]
- */
-COMMAND_HANDLER(handle_nand_device_command)
+COMMAND_HANDLER(handle_nand_list_drivers)
 {
-       int i;
-       int retval;
+       command_print(CMD_CTX, "Available NAND flash controller drivers:");
+       for (unsigned i = 0; nand_flash_controllers[i]; i++)
+               command_print(CMD_CTX, "  %s", nand_flash_controllers[i]->name);
+       return ERROR_OK;
+}
 
-       if (CMD_ARGC < 1)
+static COMMAND_HELPER(create_nand_device, const char *bank_name,
+               struct nand_flash_controller *controller)
+{
+       if (NULL != controller->commands)
        {
-               LOG_WARNING("incomplete flash device nand configuration");
-               return ERROR_FLASH_BANK_INVALID;
+               int retval = register_commands(CMD_CTX, NULL,
+                               controller->commands);
+               if (ERROR_OK != retval)
+                       return retval;
        }
+       struct nand_device *c = malloc(sizeof(struct nand_device));
 
-       for (i = 0; nand_flash_controllers[i]; i++)
-       {
-               struct nand_device *p, *c;
-
-               if (strcmp(args[0], nand_flash_controllers[i]->name) == 0)
-               {
-                       /* register flash specific commands */
-                       if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
-                       {
-                               LOG_ERROR("couldn't register '%s' commands", args[0]);
-                               return retval;
-                       }
-
-                       c = malloc(sizeof(struct nand_device));
+       c->name = strdup(bank_name);
+       c->controller = controller;
+       c->controller_priv = NULL;
+       c->manufacturer = NULL;
+       c->device = NULL;
+       c->bus_width = 0;
+       c->address_cycles = 0;
+       c->page_size = 0;
+       c->use_raw = 0;
+       c->next = NULL;
 
-                       c->controller = nand_flash_controllers[i];
-                       c->controller_priv = NULL;
-                       c->manufacturer = NULL;
-                       c->device = NULL;
-                       c->bus_width = 0;
-                       c->address_cycles = 0;
-                       c->page_size = 0;
-                       c->use_raw = 0;
-                       c->next = NULL;
+       int retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
+       if (ERROR_OK != retval)
+       {
+               LOG_ERROR("'%s' driver rejected nand flash", controller->name);
+               free(c);
+               return ERROR_OK;
+       }
 
-                       retval = CALL_COMMAND_HANDLER(nand_flash_controllers[i]->nand_device_command, c);
-                       if (ERROR_OK != retval)
-                       {
-                               LOG_ERROR("'%s' driver rejected nand flash", c->controller->name);
-                               free(c);
-                               return ERROR_OK;
-                       }
+       if (nand_devices) {
+               struct nand_device *p = nand_devices;
+               while (p && p->next) p = p->next;
+               p->next = c;
+       } else
+               nand_devices = c;
 
-                       /* put NAND device in linked list */
-                       if (nand_devices)
-                       {
-                               /* find last flash device */
-                               for (p = nand_devices; p && p->next; p = p->next);
-                               if (p)
-                                       p->next = c;
-                       }
-                       else
-                       {
-                               nand_devices = c;
-                       }
+       return ERROR_OK;
+}
 
-                       return ERROR_OK;
-               }
+COMMAND_HANDLER(handle_nand_device_command)
+{
+       if (CMD_ARGC < 1)
+       {
+               LOG_ERROR("incomplete nand device configuration");
+               return ERROR_FLASH_BANK_INVALID;
        }
 
-       /* no valid NAND controller was found (i.e. the configuration option,
-        * didn't match one of the compiled-in controllers)
-        */
-       LOG_ERROR("No valid NAND flash controller found (%s)", args[0]);
-       LOG_ERROR("compiled-in NAND flash controllers:");
-       for (i = 0; nand_flash_controllers[i]; i++)
+       // save name and increment (for compatibility) with drivers
+       const char *bank_name = *CMD_ARGV++;
+       CMD_ARGC--;
+
+       const char *driver_name = CMD_ARGV[0];
+       for (unsigned i = 0; nand_flash_controllers[i]; i++)
        {
-               LOG_ERROR("%i: %s", i, nand_flash_controllers[i]->name);
+               struct nand_flash_controller *controller = nand_flash_controllers[i];
+               if (strcmp(driver_name, controller->name) != 0)
+                       continue;
+
+               return CALL_COMMAND_HANDLER(create_nand_device,
+                               bank_name, controller);
        }
 
-       return ERROR_OK;
+       LOG_ERROR("No valid NAND flash driver found (%s)", driver_name);
+       return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
 }
 
+
+COMMAND_HANDLER(handle_nand_init_command);
+
+static const struct command_registration nand_config_command_handlers[] = {
+       {
+               .name = "device",
+               .handler = &handle_nand_device_command,
+               .mode = COMMAND_CONFIG,
+               .help = "defines a new NAND bank",
+       },
+       {
+               .name = "drivers",
+               .handler = &handle_nand_list_drivers,
+               .mode = COMMAND_ANY,
+               .help = "lists available NAND drivers",
+       },
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = &handle_nand_init_command,
+               .help = "initialize NAND devices",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration nand_command_handlers[] = {
+       {
+               .name = "nand",
+               .mode = COMMAND_ANY,
+               .help = "NAND flash command group",
+               .chain = nand_config_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int nand_register_commands(struct command_context *cmd_ctx)
 {
-       nand_cmd = register_command(cmd_ctx, NULL, "nand", NULL, COMMAND_ANY, "NAND specific commands");
+       return register_commands(cmd_ctx, NULL, nand_command_handlers);
+}
 
-       register_command(cmd_ctx, nand_cmd, "device", handle_nand_device_command, COMMAND_CONFIG, NULL);
+struct nand_device *get_nand_device_by_name(const char *name)
+{
+       unsigned requested = get_flash_name_index(name);
+       unsigned found = 0;
 
-       return ERROR_OK;
+       struct nand_device *nand;
+       for (nand = nand_devices; NULL != nand; nand = nand->next)
+       {
+               if (strcmp(nand->name, name) == 0)
+                       return nand;
+               if (!flash_driver_name_matches(nand->controller->name, name))
+                       continue;
+               if (++found < requested)
+                       continue;
+               return nand;
+       }
+       return NULL;
 }
 
 struct nand_device *get_nand_device_by_num(int num)
@@ -304,15 +355,19 @@ struct nand_device *get_nand_device_by_num(int num)
        return NULL;
 }
 
-COMMAND_HELPER(nand_command_get_device_by_num, unsigned name_index,
+COMMAND_HELPER(nand_command_get_device, unsigned name_index,
                struct nand_device **nand)
 {
-       const char *str = args[name_index];
+       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;
@@ -1050,21 +1105,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 +1132,6 @@ COMMAND_HANDLER(handle_nand_info_command)
        int first = -1;
        int last = -1;
 
-       struct nand_device *p;
-       int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
-       if (ERROR_OK != retval)
-               return retval;
-
        switch (CMD_ARGC) {
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1090,19 +1140,24 @@ 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;
        }
 
+       struct nand_device *p;
+       int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+       if (ERROR_OK != retval)
+               return retval;
+
        if (NULL == p->device)
        {
-               command_print(cmd_ctx, "#%s: not probed", args[0]);
+               command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
@@ -1112,7 +1167,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++)
@@ -1133,7 +1188,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,
@@ -1153,21 +1208,21 @@ COMMAND_HANDLER(handle_nand_probe_command)
        }
 
        struct nand_device *p;
-       int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+       int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
        if (ERROR_OK != retval)
                return retval;
 
        if ((retval = nand_probe(p)) == ERROR_OK)
        {
-               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;
@@ -1182,7 +1237,7 @@ COMMAND_HANDLER(handle_nand_erase_command)
        }
 
        struct nand_device *p;
-       int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+       int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1193,11 +1248,11 @@ COMMAND_HANDLER(handle_nand_erase_command)
        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;
@@ -1212,18 +1267,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;
@@ -1241,7 +1296,7 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
        }
 
        struct nand_device *p;
-       int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+       int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1250,12 +1305,12 @@ COMMAND_HANDLER(handle_nand_check_bad_blocks_command)
                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;
 
@@ -1269,17 +1324,17 @@ 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");
        }
 
@@ -1393,23 +1448,23 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        struct nand_device *nand;
-       int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &nand);
+       int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &nand);
        if (ERROR_OK != retval)
                return retval;
 
        if (NULL == nand->device)
        {
-               command_print(cmd_ctx, "#%s: not probed", args[0]);
+               command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
                return ERROR_OK;
        }
 
-       COMMAND_PARSE_NUMBER(u32, args[2], state->address);
+       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
        if (need_size)
        {
-                       COMMAND_PARSE_NUMBER(u32, args[2], state->size);
+                       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
                        if (state->size % nand->page_size)
                        {
-                               command_print(cmd_ctx, "only page-aligned sizes are supported");
+                               command_print(CMD_CTX, "only page-aligned sizes are supported");
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        }
        }
@@ -1418,23 +1473,23 @@ static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
        {
                for (unsigned i = minargs; i < CMD_ARGC; i++)
                {
-                       if (!strcmp(args[i], "oob_raw"))
+                       if (!strcmp(CMD_ARGV[i], "oob_raw"))
                                state->oob_format |= NAND_OOB_RAW;
-                       else if (!strcmp(args[i], "oob_only"))
+                       else if (!strcmp(CMD_ARGV[i], "oob_only"))
                                state->oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
-                       else if (sw_ecc && !strcmp(args[i], "oob_softecc"))
+                       else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc"))
                                state->oob_format |= NAND_OOB_SW_ECC;
-                       else if (sw_ecc && !strcmp(args[i], "oob_softecc_kw"))
+                       else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc_kw"))
                                state->oob_format |= NAND_OOB_SW_ECC_KW;
                        else
                        {
-                               command_print(cmd_ctx, "unknown option: %s", args[i]);
+                               command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        }
                }
        }
 
-       retval = nand_fileio_start(cmd_ctx, nand, args[1], filemode, state);
+       retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1517,7 +1572,7 @@ COMMAND_HANDLER(handle_nand_write_command)
                int bytes_read = nand_fileio_read(nand, &s);
                if (bytes_read <= 0)
                {
-                       command_print(cmd_ctx, "error while reading file");
+                       command_print(CMD_CTX, "error while reading file");
                        return nand_fileio_cleanup(&s);
                }
                s.size -= bytes_read;
@@ -1526,9 +1581,9 @@ COMMAND_HANDLER(handle_nand_write_command)
                                s.page, s.page_size, s.oob, s.oob_size);
                if (ERROR_OK != retval)
                {
-                       command_print(cmd_ctx, "failed writing file %s "
+                       command_print(CMD_CTX, "failed writing file %s "
                                "to NAND flash %s at offset 0x%8.8" PRIx32,
-                               args[1], args[0], s.address);
+                               CMD_ARGV[1], CMD_ARGV[0], s.address);
                        return nand_fileio_cleanup(&s);
                }
                s.address += s.page_size;
@@ -1536,9 +1591,9 @@ COMMAND_HANDLER(handle_nand_write_command)
 
        if (nand_fileio_finish(&s))
        {
-               command_print(cmd_ctx, "wrote file %s to NAND flash %s up to "
+               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], s.address, duration_elapsed(&s.bench),
+                               CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
                                duration_kbps(&s.bench, total_bytes));
        }
        return ERROR_OK;
@@ -1558,7 +1613,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
        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);
+       retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev);
        if (ERROR_OK != retval)
                return retval;
 
@@ -1568,7 +1623,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
                                dev.page, dev.page_size, dev.oob, dev.oob_size);
                if (ERROR_OK != retval)
                {
-                       command_print(cmd_ctx, "reading NAND flash page failed");
+                       command_print(CMD_CTX, "reading NAND flash page failed");
                        nand_fileio_cleanup(&dev);
                        return nand_fileio_cleanup(&file);
                }
@@ -1576,7 +1631,7 @@ COMMAND_HANDLER(handle_nand_verify_command)
                int bytes_read = nand_fileio_read(nand, &file);
                if (bytes_read <= 0)
                {
-                       command_print(cmd_ctx, "error while reading file");
+                       command_print(CMD_CTX, "error while reading file");
                        nand_fileio_cleanup(&dev);
                        return nand_fileio_cleanup(&file);
                }
@@ -1584,21 +1639,21 @@ COMMAND_HANDLER(handle_nand_verify_command)
                if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
                    (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size)) )
                {
-                       command_print(cmd_ctx, "NAND flash contents differ "
+                       command_print(CMD_CTX, "NAND flash contents differ "
                                                "at 0x%8.8" PRIx32, dev.address);
                        nand_fileio_cleanup(&dev);
                        return nand_fileio_cleanup(&file);
                }
 
                file.size -= bytes_read;
-               file.address += nand->page_size;
+               dev.address += nand->page_size;
        }
 
        if (nand_fileio_finish(&file) == ERROR_OK)
        {
-               command_print(cmd_ctx, "verified file %s in NAND flash %s "
+               command_print(CMD_CTX, "verified file %s in NAND flash %s "
                                "up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
-                               args[1], args[0], dev.address, duration_elapsed(&file.bench),
+                               CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
                                duration_kbps(&file.bench, dev.size));
        }
 
@@ -1621,7 +1676,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
                                s.page, s.page_size, s.oob, s.oob_size);
                if (ERROR_OK != retval)
                {
-                       command_print(cmd_ctx, "reading NAND flash page failed");
+                       command_print(CMD_CTX, "reading NAND flash page failed");
                        return nand_fileio_cleanup(&s);
                }
 
@@ -1637,7 +1692,7 @@ COMMAND_HANDLER(handle_nand_dump_command)
 
        if (nand_fileio_finish(&s) == ERROR_OK)
        {
-               command_print(cmd_ctx, "dumped %zu bytes in %fs (%0.3f kb/s)", 
+               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));
        }
@@ -1652,69 +1707,116 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
        }
 
        struct nand_device *p;
-       int retval = CALL_COMMAND_HANDLER(nand_command_get_device_by_num, 0, &p);
+       int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 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 (CMD_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;
-       }
+               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;
 }
 
+static const struct command_registration nand_exec_command_handlers[] = {
+       {
+               .name = "list",
+               .handler = &handle_nand_list_command,
+               .mode = COMMAND_EXEC,
+               .help = "list configured NAND flash devices",
+       },
+       {
+               .name = "info",
+               .handler = &handle_nand_info_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank>",
+               .help = "print info about a NAND flash device",
+       },
+       {
+               .name = "probe",
+               .handler = &handle_nand_probe_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank>",
+               .help = "identify NAND flash device <num>",
+
+       },
+       {
+               .name = "check_bad_blocks",
+               .handler = &handle_nand_check_bad_blocks_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> [<offset> <length>]",
+               .help = "check NAND flash device <num> for bad blocks",
+       },
+       {
+               .name = "erase",
+               .handler = &handle_nand_erase_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> [<offset> <length>]",
+               .help = "erase blocks on NAND flash device",
+       },
+       {
+               .name = "dump",
+               .handler = &handle_nand_dump_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <filename> <offset> <length> "
+                       "[oob_raw | oob_only]",
+               .help = "dump from NAND flash device",
+       },
+       {
+               .name = "verify",
+               .handler = &handle_nand_verify_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <filename> <offset> "
+                       "[oob_raw | oob_only | oob_softecc | oob_softecc_kw]",
+               .help = "verify NAND flash device",
+       },
+       {
+               .name = "write",
+               .handler = &handle_nand_write_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<bank> <filename> <offset> "
+                       "[oob_raw | oob_only | oob_softecc | oob_softecc_kw]",
+               .help = "write to NAND flash device",
+       },
+       {
+               .name = "raw_access",
+               .handler = &handle_nand_raw_access_command,
+               .mode = COMMAND_EXEC,
+               .usage = "<num> ['enable'|'disable']",
+               .help = "raw access to NAND flash device",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 int nand_init(struct command_context *cmd_ctx)
 {
        if (!nand_devices)
                return ERROR_OK;
+       struct command *parent = command_find_in_context(cmd_ctx, "nand");
+       return register_commands(cmd_ctx, parent, nand_exec_command_handlers);
+}
 
-       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, "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> "
-                       "[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']");
+COMMAND_HANDLER(handle_nand_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       return ERROR_OK;
+       static bool nand_initialized = false;
+       if (nand_initialized)
+       {
+               LOG_INFO("'nand init' has already been called");
+               return ERROR_OK;
+       }
+       nand_initialized = true;
+
+       LOG_DEBUG("Initializing NAND devices...");
+       return nand_init(CMD_CTX);
 }

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)