X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.ac;h=13152bf2d9a0577e445fa12f35861f90fc722e6a;hp=0a9a658676dd83daf79586f778e494df152e9cee;hb=939f9239277230a621383d9d96fb7feafe8238d3;hpb=39650e2273bcae868d9509fe36515936ce25aacb diff --git a/configure.ac b/configure.ac index 0a9a658676..13152bf2d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([openocd], [0.6.0-dev], +AC_INIT([openocd], [0.6.0-rc1-dev], [OpenOCD Mailing List ]) AC_CONFIG_SRCDIR([src/openocd.c]) @@ -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]) @@ -478,6 +483,10 @@ 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]) @@ -677,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.]) @@ -772,15 +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.]) + 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.]) + AC_DEFINE([BUILD_OSBDM], [1], [1 if you want the OSBDM driver.]) else - AC_DEFINE(BUILD_OSBDM, 0, [0 if you don't want the OSBDM 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 @@ -795,7 +816,7 @@ if test $build_remote_bitbang = yes; then build_bitbang=yes AC_DEFINE([BUILD_REMOTE_BITBANG], [1], [1 if you want the Remote Bitbang JTAG driver.]) else - AC_DEFINE([BUILD_REMOTE_BITBNAG], [0], [0 if you don't want the Remote Bitbang JTAG driver.]) + AC_DEFINE([BUILD_REMOTE_BITBANG], [0], [0 if you don't want the Remote Bitbang JTAG driver.]) fi #-- Deal with MingW/Cygwin FTD2XX issues @@ -996,6 +1017,29 @@ DWORD x = FT_DEVICE_4232H; AC_MSG_WARN([You need a newer FTD2XX driver (version 2.04.16 or later).]) fi +AC_MSG_CHECKING([for ftd2xx FT232H device support]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include "confdefs.h" +#if IS_WIN32 +#include "windows.h" +#endif +#include +#include + +DWORD x = FT_DEVICE_232H; + ]], [])], [ + AC_DEFINE([HAS_ENUM_FT232H], [1], + [Support FT232H with FTD2XX or libftdi.]) + has_enum_ft232h=yes + ], [ + has_enum_ft232h=no + ]) + AC_MSG_RESULT([$has_enum_ft232h]) + + if test $has_enum_ft232h = no; then + AC_MSG_WARN([You need a newer FTD2XX driver (version 2.08.12 or later).]) + fi + LDFLAGS=$LDFLAGS_SAVE CFLAGS=$CFLAGS_SAVE fi @@ -1054,6 +1098,25 @@ enum ftdi_chip_type x = TYPE_2232H; AC_MSG_WARN([You need a newer libftdi version (0.16 or later).]) fi +AC_MSG_CHECKING([for libftdi FT232H device support]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +#include + ]], [[ +enum ftdi_chip_type x = TYPE_232H; + ]])], [ + AC_DEFINE([HAS_ENUM_FT232H], [1], + [Support FT232H with FTD2XX or libftdi.]) + has_enum_ft232h=yes + ], [ + has_enum_ft232h=no + ]) + AC_MSG_RESULT([$has_enum_ft232h]) + + if test $has_enum_ft232h = no; then + AC_MSG_WARN([You need a newer libftdi version (0.20 or later).]) + fi + # Restore the 'unexpanded ldflags' LDFLAGS=$LDFLAGS_SAVE CFLAGS=$CFLAGS_SAVE @@ -1069,7 +1132,9 @@ fi # Check for libusb1 ported drivers. build_usb_ng=no -if test $build_jlink = yes -o $build_stlink = yes -o $build_osbdm = 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 @@ -1101,6 +1166,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 +1184,7 @@ 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])