aboutsummaryrefslogtreecommitdiff
path: root/src/openocd.c
diff options
context:
space:
mode:
authorStian Skjelsad <stian@nixia.no>2012-02-18 16:10:19 +0100
committerFreddie Chopin <freddie.chopin@gmail.com>2012-07-11 08:16:04 +0000
commite8641695c634109ebf5f1149923971770da1d28a (patch)
treef731072858a0ff2225dc95d3efd7d46e8b408eed /src/openocd.c
parent9ce207a52affec0270678808ce760450905c3f7d (diff)
downloadriscv-openocd-e8641695c634109ebf5f1149923971770da1d28a.zip
riscv-openocd-e8641695c634109ebf5f1149923971770da1d28a.tar.gz
riscv-openocd-e8641695c634109ebf5f1149923971770da1d28a.tar.bz2
When calling openocd from a shell like this:
openocd -f board/sheevaplug.cfg -c init -c exit the calling shell will believe that openocd exited with an error due to exitval will be non-zero This is not tested against incomming telnet Change-Id: I63d15715a7b46f39a7de261a45039f8c3cad7a98 Signed-off-by: Stian Skjelstad <stian@nixia.no> Reviewed-on: http://openocd.zylin.com/470 Tested-by: jenkins Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-by: Bill Traynor <wmat@alphatroop.com> Reviewed-by: Mathias Küster <kesmtp@freenet.de> Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
Diffstat (limited to 'src/openocd.c')
-rw-r--r--src/openocd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/openocd.c b/src/openocd.c
index 048ce85..d06e2c5 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -279,6 +279,8 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
return EXIT_FAILURE;
ret = parse_config_file(cmd_ctx);
+ if (ret == ERROR_OK_EXIT)
+ return ERROR_OK;
if (ret != ERROR_OK)
return EXIT_FAILURE;