Cadence virtual debug interface (vdebug) integration

[fw/openocd] / src / jtag / drivers / Makefile.am

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index e8d20ccf8914db4718a232be15937a5c2bdebf79..887f99bcd29301af0032963c64133746a53f2b3b 100644 (file)
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -19,7 +19,6 @@ DRIVERFILES =
 
 # Standard Driver: common files
 DRIVERFILES += %D%/driver.c
-DRIVERFILES += %D%/jtag_usb_common.c
 
 if USE_LIBUSB1
 DRIVERFILES += %D%/libusb_helper.c
@@ -27,12 +26,6 @@ DRIVERFILES += %D%/libusb_helper.c
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB1_LIBS)
 endif
 
-if USE_LIBUSB0
-DRIVERFILES += %D%/usb_common.c
-%C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB0_CFLAGS)
-%C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB0_LIBS)
-endif
-
 if USE_LIBFTDI
 %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBFTDI_CFLAGS)
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBFTDI_LIBS)
@@ -82,6 +75,9 @@ endif
 if JTAG_VPI
 DRIVERFILES += %D%/jtag_vpi.c
 endif
+if VDEBUG
+DRIVERFILES += %D%/vdebug.c
+endif
 if JTAG_DPI
 DRIVERFILES += %D%/jtag_dpi.c
 endif
@@ -170,8 +166,15 @@ endif
 if OPENJTAG
 DRIVERFILES += %D%/openjtag.c
 endif
-if CMSIS_DAP
-DRIVERFILES += %D%/cmsis_dap_usb.c
+if CMSIS_DAP_HID
+DRIVERFILES += %D%/cmsis_dap_usb_hid.c
+DRIVERFILES += %D%/cmsis_dap.c
+endif
+if CMSIS_DAP_USB
+DRIVERFILES += %D%/cmsis_dap_usb_bulk.c
+if !CMSIS_DAP_HID
+DRIVERFILES += %D%/cmsis_dap.c
+endif
 endif
 if IMX_GPIO
 DRIVERFILES += %D%/imx_gpio.c
@@ -186,15 +189,15 @@ endif
 DRIVERHEADERS = \
        %D%/bitbang.h \
        %D%/bitq.h \
-       %D%/jtag_usb_common.h \
+       %D%/libftdi_helper.h \
        %D%/libusb_helper.h \
+       %D%/cmsis_dap.h \
        %D%/minidriver_imp.h \
        %D%/mpsse.h \
        %D%/rlink.h \
        %D%/rlink_dtc_cmd.h \
        %D%/rlink_ep1_cmd.h \
        %D%/rlink_st7.h \
-       %D%/usb_common.h \
        %D%/versaloon/usbtoxxx/usbtoxxx.h \
        %D%/versaloon/usbtoxxx/usbtoxxx_internal.h \
        %D%/versaloon/versaloon.h \