zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mflash: factor init to 'mflash init' 

Splits mflash initialiation to 'mflash init', called from 'init'.
__archive__
Zachary T Welch 2009-11-30 17:32:56 -08:00
parent 747f8af672
commit 1de0b9d351
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/flash/mflash.c
View File

@ -1304,6 +1304,23 @@ int mflash_init_drivers(struct command_context *cmd_ctx)
return register_commands(cmd_ctx, NULL, mflash_exec_command_handlers); 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) COMMAND_HANDLER(mg_bank_cmd)
{ {
struct target *target; struct target *target;
@ -1352,6 +1369,12 @@ static const struct command_registration mflash_config_command_handlers[] = {
.help = "configure a mflash device bank", .help = "configure a mflash device bank",
.usage = "<soc> <base> <RST pin> <target #>", .usage = "<soc> <base> <RST pin> <target #>",
}, },
{
.name = "init",
.mode = COMMAND_CONFIG,
.handler = &handle_mflash_init_command,
.help = "initialize mflash devices",
},
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
static const struct command_registration mflash_command_handler[] = { static const struct command_registration mflash_command_handler[] = {

7
src/openocd.c
View File

@ -139,11 +139,10 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL; return ERROR_FAIL;
LOG_DEBUG("flash init complete"); LOG_DEBUG("flash init complete");
if (mflash_init_drivers(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("mflash init complete");
command_context_mode(CMD_CTX, COMMAND_CONFIG); command_context_mode(CMD_CTX, COMMAND_CONFIG);
if (command_run_line(CMD_CTX, "mflash init") != ERROR_OK)
return ERROR_FAIL;
if (command_run_line(CMD_CTX, "nand init") != ERROR_OK) if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;