3 files changed, 16 insertions, 6 deletions
diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 68c863f3..ff8b0272 100644
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -45,7 +45,7 @@ void add_script_search_dir (const char *dir)
 	script_search_dirs[num_script_dirs] = NULL;
 }
 
-void add_config_file_name (const char *cfg)
+void add_config_command (const char *cfg)
 {
 	num_config_files++;
 	config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
@@ -109,7 +109,7 @@ int parse_config_file(struct command_context_s *cmd_ctx)
 	char **cfg;
 
 	if (!config_file_names)
-		add_config_file_name ("script openocd.cfg");
+		add_config_command ("script openocd.cfg");
 
 	cfg = config_file_names;
 
diff --git a/src/helper/configuration.h b/src/helper/configuration.h
index d2e30e77..894d874c 100644
--- a/src/helper/configuration.h
+++ b/src/helper/configuration.h
@@ -25,7 +25,7 @@
 
 extern int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]);
 extern int parse_config_file(struct command_context_s *cmd_ctx);
-extern void add_config_file_name (const char *cfg);
+extern void add_config_command (const char *cfg);
 extern void add_script_search_dir (const char *dir);
 extern int configuration_output_handler(struct command_context_s *context, char* line);
 extern FILE *open_file_from_path (char *file, char *mode);
diff --git a/src/helper/options.c b/src/helper/options.c
index 5ad09fbd..ab36a286 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -79,9 +79,19 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 				version_flag = 1;
 				break;
 			case 'f':	/* --file | -f */
-				snprintf(command_buffer, 128, "script %s", optarg);
-				add_config_file_name(command_buffer);
+			{
+				char *t=strrchr(optarg, '.');
+				if (strcmp(t, ".tcl")==0)
+				{
+					/* Files ending in .tcl are executed as Tcl files */
+					snprintf(command_buffer, 128, "source [find {%s}]", optarg);
+				} else
+				{
+					snprintf(command_buffer, 128, "script %s", optarg);
+				}
+				add_config_command(command_buffer);
 				break;
+			}
 			case 's':	/* --search | -s */
 				add_script_search_dir(optarg);
 				break;
@@ -102,7 +112,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 			case 'c':	/* --command | -c */
 				if (optarg)
 				{
-					add_config_file_name(optarg);
+					add_config_command(optarg);
 				}	
 				break;