- added -c option that will execute an openocd command

- added at91eb40a target library example.

git-svn-id: svn://svn.berlios.de/openocd/trunk@333 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/helper/Makefile.am

@@ -1,6 +1,6 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
-AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @CPPFLAGS@
+AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" -DPKGLIBDIR=\"$(pkglibdir)\" @CPPFLAGS@
 noinst_LIBRARIES = libhelper.a
 libhelper_a_SOURCES = binarybuffer.c configuration.c log.c interpreter.c command.c time_support.c \
 	replacements.c fileio.c

src/helper/configuration.c

@@ -47,6 +47,7 @@ static struct option long_options[] =
 	{"file", 			required_argument,	0, 'f'},
 	{"search",			required_argument,	0, 's'},
 	{"log_output",		required_argument,	0, 'l'},
+	{"command",			required_argument,	0, 'c'},
 	
 	{0, 0, 0, 0}
 };
@@ -86,7 +87,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 		/* getopt_long stores the option index here. */
 		int option_index = 0;
 		
-		c = getopt_long(argc, argv, "hd::l:f:s:", long_options, &option_index);
+		c = getopt_long(argc, argv, "hd::l:f:s:c:", long_options, &option_index);
 		
 		/* Detect the end of the options. */
 		if (c == -1)
@@ -100,7 +101,8 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 				help_flag = 1;
 				break;
 			case 'f':	/* --file | -f */
-				add_config_file_name(optarg);
+				snprintf(command_buffer, 128, "script %s", optarg);
+				add_config_file_name(command_buffer);
 				break;
 			case 's':	/* --search | -s */
 				add_script_search_dir(optarg);
@@ -119,6 +121,13 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 					command_run_line(cmd_ctx, command_buffer);
 				}	
 				break;
+			case 'c':	/* --command | -c */
+				if (optarg)
+				{
+					add_config_file_name(optarg);
+				}	
+				break;
+				
 		}
 	}
 
@@ -130,12 +139,14 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 		printf("--search     | -s\tdir to search for config files and scripts.\n");
 		printf("--debug      | -d\tset debug level <0-3>\n");
 		printf("--log_output | -l\tredirect log output to file <name>\n");
+		printf("--command    | -c\trun <command>\n");
 		exit(-1);
 	}	
 
 	/* Add dir for openocd supplied scripts last so that user can over
 	   ride those scripts if desired. */
 	add_script_search_dir(PKGDATADIR);
+	add_script_search_dir(PKGLIBDIR);
 
 	return ERROR_OK;
 }
@@ -175,23 +186,13 @@ int parse_config_file(struct command_context_s *cmd_ctx)
 	FILE *config_file;
 
 	if (!config_file_names)
-		add_config_file_name ("openocd.cfg");
+		add_config_file_name ("script openocd.cfg");
 
 	cfg = config_file_names;
 
 	while (*cfg)
 	{
-		config_file = open_file_from_path(cmd_ctx, *cfg, "r");
-		if (!config_file)
-		{
-			ERROR("couldn't open config file");
-			return ERROR_NO_CONFIG_FILE;
-		}
-
-		command_run_file(cmd_ctx, config_file, COMMAND_CONFIG);
-
-		fclose(config_file);
-
+		command_run_line(cmd_ctx, *cfg);
 		cfg++;
 	}
 

src/target/Makefile.am

@@ -18,5 +18,6 @@ noinst_HEADERS = target.h trace.h register.h armv4_5.h embeddedice.h etm.h arm7t
 	arm_disassembler.h arm966e.h arm926ejs.h etb.h xscale.h arm_simulator.h image.h armv7m.h cortex_m3.h cortex_swjdp.h \
 	etm_dummy.h oocd_trace.h target_request.h trace.h
 
-nobase_dist_pkglib_DATA = xscale/debug_handler.bin
+nobase_dist_pkglib_DATA = xscale/debug_handler.bin event/at91eb40a_reset.cfg target/at91eb40a.cfg
+
 

src/target/event/at91eb40a_reset.cfg

@@ -0,0 +1,8 @@
+# Reset script for AT91EB40a
+reg cpsr 0x000000D3 		
+mww 0xFFE00020 0x1         
+mww 0xFFE00024 0x00000000  
+mww 0xFFE00000 0x01002539  
+mww 0xFFFFF124 0xFFFFFFFF  
+mww 0xffff0010 0x100
+mww 0xffff0034 0x100

src/target/target/at91eb40a.cfg

@@ -0,0 +1,34 @@
+#Script for AT91EB40a
+
+#Atmel ties SRST & TRST together, at which point it makes
+#no sense to use TRST, but use TMS instead.
+#
+#The annoying thing with tying SRST & TRST together is that
+#there is no way to halt the CPU *before and during* the
+#SRST reset, which means that the CPU will run a number
+#of cycles before it can be halted(as much as milliseconds).
+reset_config srst_only srst_pulls_trst
+ 
+#jtag scan chain
+#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
+jtag_device 4 0x1 0xf 0xe
+
+#target configuration
+#target arm7tdmi <endianness> <reset mode> <chainpos> <variant>
+target arm7tdmi little reset_init 0 arm7tdmi-s_r4
+
+# speed up memory downloads
+arm7 fast_memory_access enable
+arm7_9 dcc_downloads enable
+
+# OpenOCD does not have a flash driver for for AT91FR40162S 
+target_script 0 reset event/at91eb40a_reset.cfg
+
+# required for usable performance. Used for lots of
+# other things than flash programming.
+working_area 0 0x00000000 0x20000 nobackup
+
+#force hardware values - we're running out of flash more
+#often than not. The user can disable this in his
+#subsequent config script.
+arm7_9 force_hw_bkpts enable