Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
nand: factor init to 'nand init'
[openocd.git] / src / flash / nand.c
diff --git a/src/flash/nand.c b/src/flash/nand.c
index 77aa3e57f6c48925a1b30ea456b71150b5cbf494..1c8c0c87c3cd1639fcf633ac12e8eef11044f76e 100644 (file)
--- a/src/flash/nand.c
+++ b/src/flash/nand.c
@@ -36,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;
@@ -49,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,
@@ -63,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
  *
@@ -215,11 +216,12 @@ COMMAND_HANDLER(handle_nand_list_drivers)
 static COMMAND_HELPER(create_nand_device, const char *bank_name,
                struct nand_flash_controller *controller)
 {
-       int retval = controller->register_commands(CMD_CTX);
-       if (ERROR_OK != retval)
+       if (NULL != controller->commands)
        {
-               LOG_ERROR("couldn't register '%s' commands", controller->name);
-               return retval;
+               int retval = register_commands(CMD_CTX, NULL,
+                               controller->commands);
+               if (ERROR_OK != retval)
+                       return retval;
        }
        struct nand_device *c = malloc(sizeof(struct nand_device));
 
@@ -234,7 +236,7 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
        c->use_raw = 0;
        c->next = NULL;
 
-       retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
+       int retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
        if (ERROR_OK != retval)
        {
                LOG_ERROR("'%s' driver rejected nand flash", controller->name);
@@ -279,19 +281,43 @@ COMMAND_HANDLER(handle_nand_device_command)
        return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
 }
 
-int nand_register_commands(struct command_context *cmd_ctx)
-{
-       nand_cmd = register_command(cmd_ctx, NULL, "nand",
-                       NULL, COMMAND_ANY, "NAND specific commands");
 
-       register_command(cmd_ctx, nand_cmd, "device",
-                       &handle_nand_device_command, COMMAND_CONFIG,
-                       "defines a new NAND bank");
-       register_command(cmd_ctx, nand_cmd, "drivers",
-                       &handle_nand_list_drivers, COMMAND_ANY,
-                       "lists available NAND drivers");
+COMMAND_HANDLER(handle_nand_init_command);
 
-       return ERROR_OK;
+static const struct command_registration nand_config_command_handlers[] = {
+       {
+               .name = "device",
+               .handler = &handle_nand_device_command,
+               .mode = COMMAND_CONFIG,
+               .help = "defines a new NAND bank",
+       },
+       {
+               .name = "drivers",
+               .handler = &handle_nand_list_drivers,
+               .mode = COMMAND_ANY,
+               .help = "lists available NAND drivers",
+       },
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = &handle_nand_init_command,
+               .help = "initialize NAND devices",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration nand_command_handlers[] = {
+       {
+               .name = "nand",
+               .mode = COMMAND_ANY,
+               .help = "NAND flash command group",
+               .chain = nand_config_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+int nand_register_commands(struct command_context *cmd_ctx)
+{
+       return register_commands(cmd_ctx, NULL, nand_command_handlers);
 }
 
 struct nand_device *get_nand_device_by_name(const char *name)
@@ -1106,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, 0, &p);
-       if (ERROR_OK != retval)
-               return retval;
-
        switch (CMD_ARGC) {
        default:
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1129,6 +1150,11 @@ COMMAND_HANDLER(handle_nand_info_command)
                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", CMD_ARGV[0]);
@@ -1700,43 +1726,97 @@ COMMAND_HANDLER(handle_nand_raw_access_command)
        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);
 }
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)