X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=aa02e15759fa935388b782e76a6858b6b430c505;hb=2b2d5ec1e38efdd10ec64f8e880588350fb4edea;hp=03a56e29d2de32ef9c6e237da0adfafc8d6422ad;hpb=1bf7462edb89a79835e8bd42905d69282ba4ba17;p=openocd.git

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 03a56e29d2..aa02e15759 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -22,10 +22,10 @@
 #endif
 
 #include "mflash.h"
-#include "target.h"
-#include "time_support.h"
-#include "fileio.h"
-#include "log.h"
+#include <target/target.h>
+#include <helper/time_support.h>
+#include <helper/fileio.h>
+#include <helper/log.h>
 
 
 static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio);
@@ -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[] = {