summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/jtag/Makefile.am8
-rw-r--r--src/jtag/jtag.c7
3 files changed, 18 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b2542917..0e0f50e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,10 +50,14 @@ else
if RLINK
LIBUSB = -lusb
else
+if VSLLINK
+LIBUSB = -lusb
+else
LIBUSB =
endif
endif
endif
+endif
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 0c581296..8bb0ea21 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -96,7 +96,13 @@ else
RLINKFILES =
endif
+if VSLLINK
+VSLLINKFILES = vsllink.c
+else
+VSLLINKFILES =
+endif
+
libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
- $(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES)
+ $(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES)
noinst_HEADERS = bitbang.h jtag.h
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 16dbbd22..48921ebc 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -196,6 +196,10 @@ static int hasKHz = 0;
extern jtag_interface_t jlink_interface;
#endif
+#if BUILD_VSLLINK == 1
+ extern jtag_interface_t vsllink_interface;
+#endif
+
#if BUILD_RLINK == 1
extern jtag_interface_t rlink_interface;
#endif
@@ -237,6 +241,9 @@ jtag_interface_t *jtag_interfaces[] = {
#if BUILD_JLINK == 1
&jlink_interface,
#endif
+#if BUILD_VSLLINK == 1
+ &vsllink_interface,
+#endif
#if BUILD_RLINK == 1
&rlink_interface,
#endif