Skip to content

Commit 9eb2426

Browse files
R. Diezborneoa
authored andcommitted
configure.ac: show the Remote Bitbang driver in the config summary
Also enable this driver by default (auto). Change-Id: I112d6c8c0796d0dc464651feb1f7f81fa8b93910 Signed-off-by: R. Diez <rdiezmail-openocd@yahoo.de> Reviewed-on: https://review.openocd.org/c/openocd/+/8817 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
1 parent 160f7b3 commit 9eb2426

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

configure.ac

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ m4_define([LIBFTDI_USB1_ADAPTERS],
164164
m4_define([LIBGPIOD_ADAPTERS],
165165
[[[linuxgpiod], [Linux GPIO bitbang through libgpiod], [LINUXGPIOD]]])
166166

167+
m4_define([REMOTE_BITBANG_ADAPTER],
168+
[[[remote_bitbang], [Remote Bitbang driver], [REMOTE_BITBANG]]])
169+
167170
m4_define([LIBJAYLINK_ADAPTERS],
168171
[[[jlink], [SEGGER J-Link Programmer], [JLINK]]])
169172

@@ -310,6 +313,7 @@ AC_ARG_ADAPTERS([
310313
LIBFTDI_ADAPTERS,
311314
LIBFTDI_USB1_ADAPTERS,
312315
LIBGPIOD_ADAPTERS,
316+
REMOTE_BITBANG_ADAPTER,
313317
LINUXSPIDEV_ADAPTER,
314318
SERIAL_PORT_ADAPTERS,
315319
DUMMY_ADAPTER,
@@ -413,10 +417,6 @@ AC_ARG_ENABLE([internal-libjaylink],
413417
[Enable building internal libjaylink]),
414418
[use_internal_libjaylink=$enableval], [use_internal_libjaylink=no])
415419

416-
AC_ARG_ENABLE([remote-bitbang],
417-
AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang driver]),
418-
[build_remote_bitbang=$enableval], [build_remote_bitbang=no])
419-
420420
AS_CASE(["${host_cpu}"],
421421
[i?86|x86*], [],
422422
[
@@ -611,13 +611,6 @@ AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
611611
])
612612
])
613613

614-
AS_IF([test "x$build_remote_bitbang" = "xyes"], [
615-
build_bitbang=yes
616-
AC_DEFINE([BUILD_REMOTE_BITBANG], [1], [1 if you want the Remote Bitbang driver.])
617-
], [
618-
AC_DEFINE([BUILD_REMOTE_BITBANG], [0], [0 if you don't want the Remote Bitbang driver.])
619-
])
620-
621614
AS_IF([test "x$build_sysfsgpio" = "xyes"], [
622615
build_bitbang=yes
623616
AC_DEFINE([BUILD_SYSFSGPIO], [1], [1 if you want the SysfsGPIO driver.])
@@ -716,6 +709,7 @@ PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libu
716709
PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi])
717710
PROCESS_ADAPTERS([LIBFTDI_USB1_ADAPTERS], ["x$use_libftdi" = "xyes" -a "x$use_libusb1" = "xyes"], [libftdi and libusb-1.x])
718711
PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [Linux libgpiod])
712+
PROCESS_ADAPTERS([REMOTE_BITBANG_ADAPTER], [true], [unused])
719713
PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libjaylink-0.2])
720714
PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes"], [Linux build])
721715
PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
@@ -730,6 +724,10 @@ AS_IF([test "x$enable_linuxgpiod" != "xno"], [
730724
build_bitbang=yes
731725
])
732726

727+
AS_IF([test "x$enable_remote_bitbang" != "xno"], [
728+
build_bitbang=yes
729+
])
730+
733731
AS_IF([test "x$enable_stlink" != "xno" -o "x$enable_ti_icdi" != "xno" -o "x$enable_nulink" != "xno"], [
734732
AC_DEFINE([BUILD_HLADAPTER], [1], [1 if you want the High Level JTAG driver.])
735733
AM_CONDITIONAL([HLADAPTER], [true])
@@ -774,7 +772,6 @@ AM_CONDITIONAL([BITBANG], [test "x$build_bitbang" = "xyes"])
774772
AM_CONDITIONAL([USB_BLASTER_DRIVER], [test "x$enable_usb_blaster" != "xno" -o "x$enable_usb_blaster_2" != "xno"])
775773
AM_CONDITIONAL([AMTJTAGACCEL], [test "x$build_amtjtagaccel" = "xyes"])
776774
AM_CONDITIONAL([GW16012], [test "x$build_gw16012" = "xyes"])
777-
AM_CONDITIONAL([REMOTE_BITBANG], [test "x$build_remote_bitbang" = "xyes"])
778775
AM_CONDITIONAL([SYSFSGPIO], [test "x$build_sysfsgpio" = "xyes"])
779776
AM_CONDITIONAL([USE_LIBUSB1], [test "x$use_libusb1" = "xyes"])
780777
AM_CONDITIONAL([IS_CYGWIN], [test "x$is_cygwin" = "xyes"])
@@ -873,6 +870,7 @@ m4_foreach([adapter], [USB1_ADAPTERS,
873870
HIDAPI_ADAPTERS, HIDAPI_USB1_ADAPTERS, LIBFTDI_ADAPTERS,
874871
LIBFTDI_USB1_ADAPTERS,
875872
LIBGPIOD_ADAPTERS,
873+
REMOTE_BITBANG_ADAPTER,
876874
LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS, SERIAL_PORT_ADAPTERS,
877875
LINUXSPIDEV_ADAPTER,
878876
VDEBUG_ADAPTER,

0 commit comments

Comments
 (0)