]> git.sur5r.net Git - openocd/commitdiff
don't require 'openocd.cfg' to start
authorDavid Brownell <dbrownell@users.sourceforge.net>
Tue, 5 Jan 2010 21:32:39 +0000 (13:32 -0800)
committerDavid Brownell <dbrownell@users.sourceforge.net>
Tue, 5 Jan 2010 21:32:39 +0000 (13:32 -0800)
Starting the daemon with with just a bare "openocd" I saw:

Can't find openocd.cfg

That's not an error; don't treat it as if it were.  There may
be an error later -- like, "no interface set up" -- but let
messages only report real errors, not fake ones.

src/helper/configuration.c

index 007246c58b9cc2042c2c9b464a42bbf056ccf22d..eedd8a1ca823841305069bcbc83a92c900d536c2 100644 (file)
@@ -115,8 +115,10 @@ int parse_config_file(struct command_context *cmd_ctx)
        int retval;
        char **cfg;
 
-       if (!config_file_names)
-               add_config_command ("script openocd.cfg");
+       if (!config_file_names) {
+               command_run_line(cmd_ctx, "script openocd.cfg");
+               return ERROR_OK;
+       }
 
        cfg = config_file_names;