- added jlink support, based on Jürgen Stuber patch

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

src/Makefile.am

@@ -44,8 +44,12 @@ endif
 if USBPROG
 LIBUSB = -lusb
 else
+if JLINK
+LIBUSB = -lusb
+else
 LIBUSB =
 endif
+endif
 
 if IS_WIN32
 if FTD2XXDIR

src/jtag/Makefile.am

@@ -93,7 +93,13 @@ else
 USBPROGFILES =
 endif
 
+if JLINK
+JLINKFILES = jlink.c
+else
+JLINKFILES =
+endif
+
 libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES)
+	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES)
 
 noinst_HEADERS = bitbang.h jtag.h

src/jtag/jtag.c

@@ -193,6 +193,10 @@ static int hasKHz = 0;
 	extern jtag_interface_t usbprog_interface;
 #endif
 
+#if BUILD_JLINK == 1
+	extern jtag_interface_t jlink_interface;
+#endif
+
 jtag_interface_t *jtag_interfaces[] = {
 #if BUILD_ECOSBOARD == 1
 	&eCosBoard_interface,
@@ -226,6 +230,9 @@ jtag_interface_t *jtag_interfaces[] = {
 #endif
 #if BUILD_USBPROG == 1
 	&usbprog_interface,
+#endif
+#if BUILD_JLINK == 1
+	&jlink_interface,
 #endif
 	NULL,
 };

src/target/Makefile.am

@@ -32,5 +32,5 @@ nobase_dist_pkglib_DATA = xscale/debug_handler.bin event/at91eb40a_reset.script
 	target/lm3s811.cfg interface/luminary.cfg interface/luminary-lm3s811.cfg interface/stm32-stick.cfg \
 	interface/calao-usb-a9260-c01.cfg interface/calao-usb-a9260-c02.cfg \
 	interface/calao-usb-a9260.cfg target/at91sam9260minimal.cfg  event/lpc2148_reset.script \
-	interface/chameleon.cfg interface/at91rm9200.cfg
+	interface/chameleon.cfg interface/at91rm9200.cfg interface/jlink.cfg
 

src/target/interface/jlink.cfg

@@ -0,0 +1,3 @@
+# jlink interface
+interface jlink
+