X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.ac;h=48e7d64bad698494e4670fe4ed8081cc418f7e95;hb=10fd274cfe5447fec8a4b8d3757787d086952deb;hp=ffab637cf1948c26a3e1a682ed27e31bcfbf7730;hpb=1d75eb25e03bbb8534e595fa977383e80b4f807e;p=openocd.git diff --git a/configure.ac b/configure.ac index ffab637cf1..48e7d64bad 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER([config.h]) AH_BOTTOM([ #include +#include #include ]) @@ -384,6 +385,10 @@ AC_ARG_ENABLE([ft2232_ftd2xx], AS_HELP_STRING([--enable-ft2232_ftd2xx], [Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com]), [build_ft2232_ftd2xx=$enableval], [build_ft2232_ftd2xx=no]) +AC_ARG_ENABLE([ftdi], + AS_HELP_STRING([--enable-ftdi], [Enable building support for the MPSSE mode of FTDI based devices, using libusb-1.0 in asynchronous mode]), + [build_ftdi=$enableval], [build_ftdi=no]) + AC_ARG_ENABLE([usb_blaster_libftdi], AS_HELP_STRING([--enable-usb_blaster_libftdi], [Enable building support for the Altera USB-Blaster using the libftdi driver, opensource alternate of FTD2XX]), [build_usb_blaster_libftdi=$enableval], [build_usb_blaster_libftdi=no]) @@ -396,10 +401,6 @@ AC_ARG_ENABLE([amtjtagaccel], AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), [build_amtjtagaccel=$enableval], [build_amtjtagaccel=no]) -AC_ARG_ENABLE([ecosboard], - AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCos based JTAG debugger]), - [build_ecosboard=$enableval], [build_ecosboard=no]) - AC_ARG_ENABLE([zy1000_master], AS_HELP_STRING([--enable-zy1000-master], [Use ZY1000 JTAG master registers]), [build_zy1000_master=$enableval], [build_zy1000_master=no]) @@ -478,6 +479,14 @@ AC_ARG_ENABLE([stlink], AS_HELP_STRING([--enable-stlink], [Enable building support for the ST-Link JTAG Programmer]), [build_stlink=$enableval], [build_stlink=no]) +AC_ARG_ENABLE([osbdm], + AS_HELP_STRING([--enable-osbdm], [Enable building support for the OSBDM (JTAG only) Programmer]), + [build_osbdm=$enableval], [build_osbdm=no]) + +AC_ARG_ENABLE([opendous], + AS_HELP_STRING([--enable-opendous], [Enable building support for the estick/opendous JTAG Programmer]), + [build_opendous=$enableval], [build_opendous=no]) + AC_ARG_ENABLE([minidriver_dummy], AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]), [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no]) @@ -628,12 +637,6 @@ else AC_DEFINE([BUILD_EP93XX], [0], [0 if you don't want ep93xx.]) fi -if test $build_ecosboard = yes; then - AC_DEFINE([BUILD_ECOSBOARD], [1], [1 if you want eCosBoard.]) -else - AC_DEFINE([BUILD_ECOSBOARD], [0], [0 if you don't want eCosBoard.]) -fi - if test $build_zy1000 = yes; then AC_DEFINE([BUILD_ZY1000], [1], [1 if you want ZY1000.]) else @@ -683,6 +686,12 @@ else AC_DEFINE([BUILD_FT2232_FTD2XX], [0], [0 if you don't want ftd2xx ft2232.]) fi +if test $build_ftdi = yes; then + AC_DEFINE([BUILD_FTDI], [1], [1 if you want ftdi.]) +else + AC_DEFINE([BUILD_FTDI], [0], [0 if you don't want ftdi.]) +fi + if test $build_usb_blaster_libftdi = yes; then build_bitbang=yes AC_DEFINE([BUILD_USB_BLASTER_LIBFTDI], [1], [1 if you want libftdi usb_blaster.]) @@ -778,9 +787,21 @@ else fi if test $build_stlink = yes; then - AC_DEFINE(BUILD_STLINK, 1, [1 if you want the ST-Link JTAG driver.]) + AC_DEFINE([BUILD_STLINK], [1], [1 if you want the ST-Link JTAG driver.]) +else + AC_DEFINE([BUILD_STLINK], [0], [0 if you don't want the ST-Link JTAG driver.]) +fi + +if test $build_osbdm = yes; then + AC_DEFINE([BUILD_OSBDM], [1], [1 if you want the OSBDM driver.]) else - AC_DEFINE(BUILD_STLINK, 0, [0 if you don't want the ST-Link JTAG driver.]) + AC_DEFINE([BUILD_OSBDM], [0], [0 if you don't want the OSBDM driver.]) +fi + +if test $build_opendous = yes; then + AC_DEFINE([BUILD_OPENDOUS], [1], [1 if you want the estick/opendous JTAG driver.]) +else + AC_DEFINE([BUILD_OPENDOUS], [0], [0 if you don't want the estick/opendous JTAG driver.]) fi if test "$use_internal_jimtcl" = yes; then @@ -1069,7 +1090,9 @@ fi # Check for libusb1 ported drivers. build_usb_ng=no -if test $build_jlink = yes -o $build_stlink = yes; then +if test $build_jlink = yes -o $build_stlink = yes -o $build_osbdm = yes -o \ + $build_opendous = yes -o $build_ftdi = yes +then build_usb_ng=yes fi @@ -1094,7 +1117,6 @@ AM_CONDITIONAL([PARPORT], [test $build_parport = yes]) AM_CONDITIONAL([DUMMY], [test $build_dummy = yes]) AM_CONDITIONAL([GIVEIO], [test x$parport_use_giveio = xyes]) AM_CONDITIONAL([EP93XX], [test $build_ep93xx = yes]) -AM_CONDITIONAL([ECOSBOARD], [test $build_ecosboard = yes]) AM_CONDITIONAL([ZY1000], [test $build_zy1000 = yes]) AM_CONDITIONAL([ZY1000_MASTER], [test $build_zy1000_master = yes]) AM_CONDITIONAL([IOUTIL], [test $build_ioutil = yes]) @@ -1102,6 +1124,7 @@ AM_CONDITIONAL([AT91RM9200], [test $build_at91rm9200 = yes]) AM_CONDITIONAL([BITBANG], [test $build_bitbang = yes]) AM_CONDITIONAL([FT2232_LIBFTDI], [test $build_ft2232_libftdi = yes]) AM_CONDITIONAL([FT2232_DRIVER], [test $build_ft2232_ftd2xx = yes -o $build_ft2232_libftdi = yes]) +AM_CONDITIONAL([FTDI_DRIVER], [test $build_ftdi = yes]) AM_CONDITIONAL([USB_BLASTER_LIBFTDI], [test $build_usb_blaster_libftdi = yes]) AM_CONDITIONAL([USB_BLASTER_DRIVER], [test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_libftdi = yes]) AM_CONDITIONAL([AMTJTAGACCEL], [test $build_amtjtagaccel = yes]) @@ -1118,6 +1141,8 @@ AM_CONDITIONAL([ARMJTAGEW], [test $build_armjtagew = yes]) AM_CONDITIONAL([REMOTE_BITBANG], [test $build_remote_bitbang = yes]) AM_CONDITIONAL([BUSPIRATE], [test $build_buspirate = yes]) AM_CONDITIONAL([STLINK], [test $build_stlink = yes]) +AM_CONDITIONAL([OSBDM], [test $build_osbdm = yes]) +AM_CONDITIONAL([OPENDOUS], [test $build_opendous = yes]) AM_CONDITIONAL([USB], [test $build_usb = yes]) AM_CONDITIONAL([USB_NG], [test $build_usb_ng = yes]) AM_CONDITIONAL([USE_LIBUSB0], [test $use_libusb0 = yes])