X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.ac;h=7b82be10e215040e26959bcf6863d9b44b347169;hp=ffab637cf1948c26a3e1a682ed27e31bcfbf7730;hb=18df479f0a96e9e6b50d7e3393adc90629c049f7;hpb=1d75eb25e03bbb8534e595fa977383e80b4f807e diff --git a/configure.ac b/configure.ac index ffab637cf1..7b82be10e2 100644 --- a/configure.ac +++ b/configure.ac @@ -396,10 +396,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 +474,10 @@ 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([minidriver_dummy], AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]), [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no]) @@ -628,12 +628,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 @@ -778,9 +772,15 @@ 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 "$use_internal_jimtcl" = yes; then @@ -1069,7 +1069,7 @@ 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; then build_usb_ng=yes fi @@ -1094,7 +1094,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]) @@ -1118,6 +1117,7 @@ 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([USB], [test $build_usb = yes]) AM_CONDITIONAL([USB_NG], [test $build_usb_ng = yes]) AM_CONDITIONAL([USE_LIBUSB0], [test $use_libusb0 = yes])