This is an automated email from Gerrit.
"R. Diez <rdiez-2...@rd10.de>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/8533
-- gerrit
commit b532288b3400b569157cc71f7f2fd11e861c2627
Author: R. Diez <rdiezmail-open...@yahoo.de>
Date: Sat Nov 2 23:34:23 2024 +0100
enable the Bus Pirate adapter by default on Linux
Change-Id: Ifa8ebcee380c16d7e308ba7a75dbffdb74208285
Signed-off-by: R. Diez <rdiezmail-open...@yahoo.de>
diff --git a/configure.ac b/configure.ac
index 9355ffb932..ce3b8afee7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,7 +267,7 @@ AC_ARG_ADAPTERS([
HIDAPI_ADAPTERS,
HIDAPI_USB1_ADAPTERS,
LIBFTDI_ADAPTERS,
- LIBFTDI_USB1_ADAPTERS
+ LIBFTDI_USB1_ADAPTERS,
LIBGPIOD_ADAPTERS,
SERIAL_PORT_ADAPTERS,
PCIE_ADAPTERS,
@@ -429,13 +429,6 @@ AS_CASE([$host],
])
parport_use_giveio=yes
- AS_IF([test "x$enable_buspirate" = "xyes"], [
- AC_MSG_ERROR([buspirate currently not supported by MinGW32 hosts])
- ])
-
- # In case enable_buspirate=auto, make sure it will not be built.
- enable_buspirate=no
-
AC_SUBST([HOST_CPPFLAGS], ["-D__USE_MINGW_ANSI_STDIO -DFD_SETSIZE=128"])
],
[*darwin*], [
@@ -578,12 +571,6 @@ AS_IF([test "x$build_gw16012" = "xyes"], [
AC_DEFINE([BUILD_GW16012], [0], [0 if you don't want the Gateworks GW16012
driver.])
])
-AS_IF([test "x$enable_buspirate" != "xno"], [
- AC_DEFINE([BUILD_BUSPIRATE], [1], [1 if you want the Buspirate JTAG driver.])
-], [
- AC_DEFINE([BUILD_BUSPIRATE], [0], [0 if you don't want the Buspirate JTAG
driver.])
-])
-
AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
AS_IF([test -f "$srcdir/jimtcl/configure"], [
AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
@@ -713,6 +700,7 @@ PROCESS_ADAPTERS([LIBFTDI_USB1_ADAPTERS], ["x$use_libftdi"
= "xyes" -a "x$use_li
PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [libgpiod])
PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes"
-o "x$use_libjaylink" = "xyes"], [libjaylink-0.2])
PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes"], [Linux build])
+PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$is_linux" = "xyes"], [Linux
build])
PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused])
AS_IF([test "x$enable_linuxgpiod" != "xno"], [
@@ -767,7 +755,6 @@ AM_CONDITIONAL([USB_BLASTER_DRIVER], [test
"x$enable_usb_blaster" != "xno" -o "x
AM_CONDITIONAL([AMTJTAGACCEL], [test "x$build_amtjtagaccel" = "xyes"])
AM_CONDITIONAL([GW16012], [test "x$build_gw16012" = "xyes"])
AM_CONDITIONAL([REMOTE_BITBANG], [test "x$build_remote_bitbang" = "xyes"])
-AM_CONDITIONAL([BUSPIRATE], [test "x$enable_buspirate" != "xno"])
AM_CONDITIONAL([SYSFSGPIO], [test "x$build_sysfsgpio" = "xyes"])
AM_CONDITIONAL([USE_LIBUSB1], [test "x$use_libusb1" = "xyes"])
AM_CONDITIONAL([IS_CYGWIN], [test "x$is_cygwin" = "xyes"])
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index e404afe9f0..8be834859c 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -143,7 +143,7 @@ endif
if ARMJTAGEW
DRIVERFILES += %D%/arm-jtag-ew.c
endif
-if BUSPIRATE
+if BUS_PIRATE
DRIVERFILES += %D%/buspirate.c
endif
if REMOTE_BITBANG
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index c24ead8cd9..67f0838e39 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -102,7 +102,7 @@ struct adapter_driver *adapter_drivers[] = {
#if BUILD_ARMJTAGEW == 1
&armjtagew_adapter_driver,
#endif
-#if BUILD_BUSPIRATE == 1
+#if BUILD_BUS_PIRATE == 1
&buspirate_adapter_driver,
#endif
#if BUILD_REMOTE_BITBANG == 1
--
