projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check return values to avoid infinite wait in loop on error.
[fw/openocd]
/
src
/
jtag
/
Makefile.am
diff --git
a/src/jtag/Makefile.am
b/src/jtag/Makefile.am
index 58110ff4166e5221a6c17628c8addd08f011210e..ba722c6dc7a55c0a0f5c5bb24c00b8e6578228a0 100644
(file)
--- a/
src/jtag/Makefile.am
+++ b/
src/jtag/Makefile.am
@@
-5,137
+5,93
@@
AM_CPPFLAGS = \
METASOURCES = AUTO
noinst_LTLIBRARIES = libjtag.la
METASOURCES = AUTO
noinst_LTLIBRARIES = libjtag.la
-if BITBANG
-BITBANGFILES = bitbang.c
-else
-BITBANGFILES =
-endif
+DRIVERFILES =
-if PARPORT
-PARPORTFILES = parport.c
-else
-PARPORTFILES =
-endif
+if MINIDRIVER
-if DUMMY
-DUMMYFILES = dummy.c
-else
-DUMMYFILES =
+if ZY1000
+DRIVERFILES += zy1000/zy1000.c
+AM_CPPFLAGS += -I$(srcdir)/zy1000
+endif
+if MINIDRIVER_DUMMY
+DRIVERFILES += minidummy/minidummy.c commands.c
+AM_CPPFLAGS += -I$(srcdir)/minidummy
endif
endif
-if FT2232_LIBFTDI
-FT2232FILES = ft2232.c
else
else
-if FT2232_FTD2XX
-FT2232FILES = ft2232.c
-else
-FT2232FILES =
+
+# Standard Driver: common files
+DRIVERFILES += driver.c commands.c
+
+if BITBANG
+DRIVERFILES += bitbang.c
endif
endif
+if PARPORT
+DRIVERFILES += parport.c
+endif
+if DUMMY
+DRIVERFILES += dummy.c
+endif
+if FT2232_DRIVER
+DRIVERFILES += ft2232.c
endif
endif
-
if AMTJTAGACCEL
if AMTJTAGACCEL
-AMTJTAGACCELFILES = amt_jtagaccel.c
-else
-AMTJTAGACCELFILES =
+DRIVERFILES += amt_jtagaccel.c
endif
endif
-
if EP93XX
if EP93XX
-EP93XXFILES = ep93xx.c
-else
-EP93XXFILES =
-endif
-
-if ECOSBOARD
-ECOSBOARDFILES = zy1000.c
-else
-ECOSBOARDFILES =
+DRIVERFILES += ep93xx.c
endif
endif
-
if AT91RM9200
if AT91RM9200
-AT91RM9200FILES = at91rm9200.c
-else
-AT91RM9200FILES =
+DRIVERFILES += at91rm9200.c
endif
endif
-
if GW16012
if GW16012
-GW16012FILES = gw16012.c
-else
-GW16012FILES =
+DRIVERFILES += gw16012.c
endif
endif
-
if BITQ
if BITQ
-BITQFILES = bitq.c
-else
-BITQFILES =
+DRIVERFILES += bitq.c
endif
endif
-
-if PRESTO_LIBFTDI
-PRESTOFILES = presto.c
-else
-if PRESTO_FTD2XX
-PRESTOFILES = presto.c
-else
-PRESTOFILES =
+if PRESTO_DRIVER
+DRIVERFILES += presto.c
endif
endif
-endif
-
if USBPROG
if USBPROG
-USBPROGFILES = usbprog.c
-else
-USBPROGFILES =
+DRIVERFILES += usbprog.c
endif
endif
-
if JLINK
if JLINK
-JLINKFILES = jlink.c
-else
-JLINKFILES =
+DRIVERFILES += jlink.c
endif
endif
-
if RLINK
if RLINK
-RLINKFILES = rlink/rlink.c rlink/rlink_speed_table.c
-else
-RLINKFILES =
+DRIVERFILES += rlink/rlink.c rlink/rlink_speed_table.c
endif
endif
-
if VSLLINK
if VSLLINK
-VSLLINKFILES = vsllink.c
-else
-VSLLINKFILES =
+DRIVERFILES += vsllink.c
endif
endif
-
if ARMJTAGEW
if ARMJTAGEW
-ARMJTAGEWFILES = arm-jtag-ew.c
-else
-ARMJTAGEWFILES =
+DRIVERFILES += arm-jtag-ew.c
endif
endif
+endif
+# endif // MINIDRIVER
+
+
libjtag_la_SOURCES = \
libjtag_la_SOURCES = \
- jtag.c \
- jtag_driver.c \
- $(BITBANGFILES) \
- $(PARPORTFILES) \
- $(DUMMYFILES) \
- $(FT2232FILES) \
- $(AMTJTAGACCELFILES) \
- $(EP93XXFILES) \
- $(AT91RM9200FILES) \
- $(GW16012FILES) \
- $(BITQFILES) \
- $(PRESTOFILES) \
- $(USBPROGFILES) \
- $(ECOSBOARDFILES) \
- $(JLINKFILES) \
- $(RLINKFILES) \
- $(VSLLINKFILES) \
- $(ARMJTAGEWFILES)
+ core.c \
+ interface.c \
+ interfaces.c \
+ tcl.c \
+ $(DRIVERFILES)
noinst_HEADERS = \
noinst_HEADERS = \
+ interface.h \
+ interfaces.h \
+ commands.h \
+ minidriver.h \
bitbang.h \
jtag.h \
bitq.h \
rlink/dtc_cmd.h \
rlink/ep1_cmd.h \
rlink/rlink.h \
bitbang.h \
jtag.h \
bitq.h \
rlink/dtc_cmd.h \
rlink/ep1_cmd.h \
rlink/rlink.h \
- rlink/st7.h
+ rlink/st7.h \
+ minidummy/jtag_minidriver.h
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES =
$(srcdir)/
Makefile.in