interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nand: factor init to 'nand init' 

Split NAND initialization into 'nand init', which gets called from
the main 'init' command.
This commit is contained in:
Zachary T Welch 2009-11-30 17:27:21 -08:00
parent 682910fdc2
commit 747f8af672
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/flash/nand.c
View File

@ -281,6 +281,9 @@ COMMAND_HANDLER(handle_nand_device_command)
return CALL_COMMAND_HANDLER(handle_nand_list_drivers); return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
} }
COMMAND_HANDLER(handle_nand_init_command);
static const struct command_registration nand_config_command_handlers[] = { static const struct command_registration nand_config_command_handlers[] = {
{ {
.name = "device", .name = "device",
@ -294,6 +297,12 @@ static const struct command_registration nand_config_command_handlers[] = {
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.help = "lists available NAND drivers", .help = "lists available NAND drivers",
}, },
{
.name = "init",
.mode = COMMAND_CONFIG,
.handler = &handle_nand_init_command,
.help = "initialize NAND devices",
},
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };
static const struct command_registration nand_command_handlers[] = { static const struct command_registration nand_command_handlers[] = {
@ -1794,3 +1803,20 @@ int nand_init(struct command_context *cmd_ctx)
struct command *parent = command_find_in_context(cmd_ctx, "nand"); struct command *parent = command_find_in_context(cmd_ctx, "nand");
return register_commands(cmd_ctx, parent, nand_exec_command_handlers); return register_commands(cmd_ctx, parent, nand_exec_command_handlers);
} }
COMMAND_HANDLER(handle_nand_init_command)
{
if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
static bool nand_initialized = false;
if (nand_initialized)
{
LOG_INFO("'nand init' has already been called");
return ERROR_OK;
}
nand_initialized = true;
LOG_DEBUG("Initializing NAND devices...");
return nand_init(CMD_CTX);
}

7
src/openocd.c
View File

@ -143,11 +143,10 @@ COMMAND_HANDLER(handle_init_command)
return ERROR_FAIL; return ERROR_FAIL;
LOG_DEBUG("mflash init complete"); LOG_DEBUG("mflash init complete");
if (nand_init(CMD_CTX) != ERROR_OK)
return ERROR_FAIL;
LOG_DEBUG("NAND init complete");
command_context_mode(CMD_CTX, COMMAND_CONFIG); command_context_mode(CMD_CTX, COMMAND_CONFIG);
if (command_run_line(CMD_CTX, "nand init") != ERROR_OK)
return ERROR_FAIL;
if (command_run_line(CMD_CTX, "pld init") != ERROR_OK) if (command_run_line(CMD_CTX, "pld init") != ERROR_OK)
return ERROR_FAIL; return ERROR_FAIL;
command_context_mode(CMD_CTX, COMMAND_EXEC); command_context_mode(CMD_CTX, COMMAND_EXEC);