diff --git a/src/ecosboard.c b/src/ecosboard.c
index 1e3152e76..f6e040fac 100644
--- a/src/ecosboard.c
+++ b/src/ecosboard.c
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2007-2009 by Øyvind Harboe *
+ * Copyright (C) 2007-2010 by Øyvind Harboe *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -24,6 +24,7 @@
#include <helper/types.h>
#include <jtag/jtag.h>
#include <helper/ioutil.h>
+#include <helper/util.h>
#include <helper/configuration.h>
#include <server/server.h>
@@ -1089,6 +1090,9 @@ int main(int argc, char *argv[])
command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
command_context_mode(cmd_ctx, COMMAND_CONFIG);
+ if (util_init(cmd_ctx) != ERROR_OK)
+ return EXIT_FAILURE;
+
if (ioutil_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 27ae1e20b..cca5ac350 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -22,7 +22,8 @@ libhelper_la_SOURCES = \
command.c \
time_support.c \
replacements.c \
- fileio.c
+ fileio.c \
+ util.c
if IOUTIL
libhelper_la_SOURCES += ioutil.c
@@ -40,6 +41,7 @@ noinst_HEADERS = \
binarybuffer.h \
configuration.h \
ioutil.h \
+ util.h \
types.h \
log.h \
command.h \
diff --git a/src/helper/util.c b/src/helper/util.c
new file mode 100644
index 000000000..12b83f61e
--- /dev/null
+++ b/src/helper/util.c
@@ -0,0 +1,62 @@
+/***************************************************************************
+ * Copyright (C) 2010 by Øyvind Harboe *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+/* this file contains various functionality useful to standalone systems */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "log.h"
+#include "time_support.h"
+
+static int
+util_Jim_Command_ms(Jim_Interp *interp,
+ int argc,
+ Jim_Obj * const *argv)
+{
+ if (argc != 1)
+ {
+ Jim_WrongNumArgs(interp, 1, argv, "ls ?dir?");
+ return JIM_ERR;
+ }
+
+ /* Cast from 64 to 32 bit int works for 2's-compliment
+ * when calculating differences*/
+ Jim_SetResult(interp, Jim_NewIntObj(interp, (int)timeval_ms()));
+
+ return JIM_OK;
+}
+
+static const struct command_registration util_command_handlers[] = {
+ // jim handlers
+ {
+ .name = "ms",
+ .mode = COMMAND_ANY,
+ .jim_handler = util_Jim_Command_ms,
+ .help = "Returns ever increasing milliseconds. Used to calculuate differences in time.",
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
+int util_init(struct command_context *cmd_ctx)
+{
+ return register_commands(cmd_ctx, NULL, util_command_handlers);
+}
diff --git a/src/helper/util.h b/src/helper/util.h
new file mode 100644
index 000000000..267477ad3
--- /dev/null
+++ b/src/helper/util.h
@@ -0,0 +1,27 @@
+/***************************************************************************
+ * Copyright (C) 2010 by Øyvind Harboe *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#ifndef HELPER_UTILS_H
+#define HELPER_UTILS_H
+
+struct command_context;
+
+int util_init(struct command_context *cmd_ctx);
+
+#endif // HELPER_UTILS_H
diff --git a/src/openocd.c b/src/openocd.c
index 04a630741..69ed7601e 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -33,6 +33,7 @@
#include <jtag/jtag.h>
#include <jtag/transport.h>
#include <helper/ioutil.h>
+#include <helper/util.h>
#include <helper/configuration.h>
#include <flash/nor/core.h>
#include <flash/nand/core.h>
@@ -268,6 +269,9 @@ int openocd_main(int argc, char *argv[])
cmd_ctx = setup_command_handler(NULL);
+ if (util_init(cmd_ctx) != ERROR_OK)
+ return EXIT_FAILURE;
+
if (ioutil_init(cmd_ctx) != ERROR_OK)
return EXIT_FAILURE;