mflash: factor init to 'mflash init'

Splits mflash initialiation to 'mflash init', called from 'init'.

2 files changed, 25 insertions, 3 deletions

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 03a56e29..8f42aa6e 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -1304,6 +1304,23 @@ int mflash_init_drivers(struct command_context *cmd_ctx)
 	return register_commands(cmd_ctx, NULL, mflash_exec_command_handlers);
 }
 
+COMMAND_HANDLER(handle_mflash_init_command)
+{
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	static bool mflash_initialized = false;
+	if (mflash_initialized)
+	{
+		LOG_INFO("'mflash init' has already been called");
+		return ERROR_OK;
+	}
+	mflash_initialized = true;
+
+	LOG_DEBUG("Initializing mflash devices...");
+	return mflash_init_drivers(CMD_CTX);
+}
+
 COMMAND_HANDLER(mg_bank_cmd)
 {
 	struct target *target;
@@ -1352,6 +1369,12 @@ static const struct command_registration mflash_config_command_handlers[] = {
 		.help = "configure a mflash device bank",
 		.usage = "<soc> <base> <RST pin> <target #>",
 	},
+	{
+		.name = "init",
+		.mode = COMMAND_CONFIG,
+		.handler = &handle_mflash_init_command,
+		.help = "initialize mflash devices",
+	},
 	COMMAND_REGISTRATION_DONE
 };
 static const struct command_registration mflash_command_handler[] = {
diff --git a/src/openocd.c b/src/openocd.c
index 1026379d..ff35f878 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -139,11 +139,10 @@ COMMAND_HANDLER(handle_init_command)
 		return ERROR_FAIL;
 	LOG_DEBUG("flash init complete");
 
-	if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
+	command_context_mode(CMD_CTX, COMMAND_CONFIG);
+	if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
 		return ERROR_FAIL;
-	LOG_DEBUG("mflash init complete");
 
-	command_context_mode(CMD_CTX, COMMAND_CONFIG);
 	if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
 		return ERROR_FAIL;