flash: factor init to 'flash init'

Split flash initialiation into 'flash init', called from 'init'.

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 7023ef97a9c3e610a92bae8380d8748c941a7fef..1e5ac9a355c909de777f8e3aacc585cc19ee3be2 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -1375,6 +1375,23 @@ int flash_init_drivers(struct command_context *cmd_ctx)
        return register_commands(cmd_ctx, parent, flash_exec_command_handlers);
 }
 
+COMMAND_HANDLER(handle_flash_init_command)
+{
+       if (CMD_ARGC != 0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
+       static bool flash_initialized = false;
+       if (flash_initialized)
+       {
+               LOG_INFO("'flash init' has already been called");
+               return ERROR_OK;
+       }
+       flash_initialized = true;
+
+       LOG_DEBUG("Initializing flash devices...");
+       return flash_init_drivers(CMD_CTX);
+}
+
 static const struct command_registration flash_config_command_handlers[] = {
        {
                .name = "bank",
@@ -1386,6 +1403,12 @@ static const struct command_registration flash_config_command_handlers[] = {
                .help = "Define a new bank with the given name, "
                        "using the specified NOR flash driver.",
        },
+       {
+               .name = "init",
+               .mode = COMMAND_CONFIG,
+               .handler = &handle_flash_init_command,
+               .help = "initialize flash devices",
+       },
        {
                .name = "banks",
                .mode = COMMAND_ANY,

diff --git a/src/openocd.c b/src/openocd.c
index ff35f8782e0eb8996ec25e1fad5e210cb0b18f30..aaa45314e8922ef12c75d03c1ef02e80eebb80a9 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -135,11 +135,10 @@ COMMAND_HANDLER(handle_init_command)
                }
        }
 
-       if (flash_init_drivers(CMD_CTX) != ERROR_OK)
+       command_context_mode(CMD_CTX, COMMAND_CONFIG);
+       if (command_run_line(CMD_CTX, "flash init") != ERROR_OK)
                return ERROR_FAIL;
-       LOG_DEBUG("flash init complete");
 
-       command_context_mode(CMD_CTX, COMMAND_CONFIG);
        if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
                return ERROR_FAIL;