diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-06-18 23:10:45 +0200 |
|---|---|---|
| committer | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2014-08-02 09:01:32 +0000 |
| commit | 91e47f3ab8875176b6f6ac9244562f42f140467d (patch) | |
| tree | 7d5fa6bbf301f70561a6b105bd4469f2093c1c96 /src/openocd.c | |
| parent | f1b04a20dcf6baedbd0f06a38d8748586d48dbb7 (diff) | |
| download | riscv-openocd-91e47f3ab8875176b6f6ac9244562f42f140467d.zip riscv-openocd-91e47f3ab8875176b6f6ac9244562f42f140467d.tar.gz riscv-openocd-91e47f3ab8875176b6f6ac9244562f42f140467d.tar.bz2 | |
Fix some problems with the bin2char utility
Don't hardcode the type for the array, just output the array initializer
so the includer can choose the type and storage class, zero-terminate at
will and so on.
Change-Id: I6d5e0710eaaba0a218b3eb32f6569177356f4462
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/2176
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/openocd.c b/src/openocd.c index 71e047f..758febb 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -50,6 +50,11 @@ #define OPENOCD_VERSION \ "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")" +static const char openocd_startup_tcl[] = { +#include "startup_tcl.inc" +0 /* Terminate with zero */ +}; + /* Give scripts and TELNET a way to find out what version this is */ static int jim_version_command(Jim_Interp *interp, int argc, Jim_Obj * const *argv) @@ -228,8 +233,7 @@ struct command_context *setup_command_handler(Jim_Interp *interp) log_init(); LOG_DEBUG("log_init: complete"); - const char *startup = openocd_startup_tcl; - struct command_context *cmd_ctx = command_init(startup, interp); + struct command_context *cmd_ctx = command_init(openocd_startup_tcl, interp); /* register subsystem commands */ typedef int (*command_registrant_t)(struct command_context *cmd_ctx_value); |