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 895abe31016a57bd69f722ff8dbf3c79fff49edc..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,
@@ -279,6 +281,9 @@ COMMAND_HANDLER(handle_nand_device_command)
        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",
@@ -292,6 +297,12 @@ static const struct command_registration nand_config_command_handlers[] = {
                .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[] = {
@@ -1792,3 +1803,20 @@ int nand_init(struct command_context *cmd_ctx)
        struct command *parent = command_find_in_context(cmd_ctx, "nand");
        return register_commands(cmd_ctx, parent, nand_exec_command_handlers);
 }
+
+COMMAND_HANDLER(handle_nand_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       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);
+}