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

flash: factor init to 'flash init' 

Split flash initialiation into 'flash init', called from 'init'.
__archive__
Zachary T Welch 2009-11-30 17:38:02 -08:00
parent 1de0b9d351
commit 37201c019f
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/flash.c
View File

@ -1375,6 +1375,23 @@ int flash_init_drivers(struct command_context *cmd_ctx)
return register_commands(cmd_ctx, parent, flash_exec_command_handlers); 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[] = { static const struct command_registration flash_config_command_handlers[] = {
{ {
.name = "bank", .name = "bank",
@ -1386,6 +1403,12 @@ static const struct command_registration flash_config_command_handlers[] = {
.help = "Define a new bank with the given name, " .help = "Define a new bank with the given name, "
"using the specified NOR flash driver.", "using the specified NOR flash driver.",
}, },
{
.name = "init",
.mode = COMMAND_CONFIG,
.handler = &handle_flash_init_command,
.help = "initialize flash devices",
},
{ {
.name = "banks", .name = "banks",
.mode = COMMAND_ANY, .mode = COMMAND_ANY,

7
src/openocd.c
View File

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