aboutsummaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2011-11-23 23:39:57 +0000
committerPeter Stuge <peter@stuge.se>2011-11-23 23:51:36 +0000
commitb46231669928bf4edb48c50b327cb68b0d01a27e (patch)
treeb47d50c5ff868cfce2eb0201e0343af90c9c4e0e /src/target
parent17322b729c9af2d1837fc1407f8ac9fc4b9483f5 (diff)
downloadriscv-openocd-b46231669928bf4edb48c50b327cb68b0d01a27e.zip
riscv-openocd-b46231669928bf4edb48c50b327cb68b0d01a27e.tar.gz
riscv-openocd-b46231669928bf4edb48c50b327cb68b0d01a27e.tar.bz2
target: fix init_targets script handling
This fixes an issue when init is called before init_targets has been executed. Make sure init_targets is called before init. Change-Id: Icd5bd4c2a8eea2e399d9de4e331a77560e9672ac Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/235 Tested-by: jenkins Reviewed-by: Peter Stuge <peter@stuge.se>
Diffstat (limited to 'src/target')
-rw-r--r--src/target/target.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/target/target.c b/src/target/target.c
index 4708a1d..bcd00a1 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1043,6 +1043,8 @@ static int target_init(struct command_context *cmd_ctx)
COMMAND_HANDLER(handle_target_init_command)
{
+ int retval;
+
if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
@@ -1054,6 +1056,10 @@ COMMAND_HANDLER(handle_target_init_command)
}
target_initialized = true;
+ retval = command_run_line(CMD_CTX, "init_targets");
+ if (ERROR_OK != retval)
+ return retval;
+
LOG_DEBUG("Initializing targets...");
return target_init(CMD_CTX);
}