Skip to content

Commit d8a2f6d

Browse files
R. Diezborneoa
authored andcommitted
configure.ac: show the Amontec JTAG-Accelerator driver in the config summary
Also enable this driver by default (auto). Change-Id: I7f592dd697c6ee150a81e151ff2333447cd9130d Signed-off-by: R. Diez <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8835 Tested-by: jenkins Reviewed-by: zapb <[email protected]> Reviewed-by: Antonio Borneo <[email protected]>
1 parent 420f637 commit d8a2f6d

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

configure.ac

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ m4_define([JTAG_VPI_ADAPTER],
190190
m4_define([RSHIM_ADAPTER],
191191
[[[rshim], [BlueField SoC via rshim], [RSHIM]]])
192192

193+
m4_define([AMTJTAGACCEL_ADAPTER],
194+
[[[amtjtagaccel], [Amontec JTAG-Accelerator driver], [AMTJTAGACCEL]]])
195+
193196
# The word 'Adapter' in "Dummy Adapter" below must begin with a capital letter
194197
# because there is an M4 macro called 'adapter'.
195198
m4_define([DUMMY_ADAPTER],
@@ -320,6 +323,7 @@ AC_ARG_ADAPTERS([
320323
JTAG_DPI_ADAPTER,
321324
JTAG_VPI_ADAPTER,
322325
RSHIM_ADAPTER,
326+
AMTJTAGACCEL_ADAPTER,
323327
PCIE_ADAPTERS,
324328
LIBJAYLINK_ADAPTERS
325329
],[auto])
@@ -338,10 +342,6 @@ AC_ARG_ENABLE([parport_giveio],
338342
[Enable use of giveio for parport (for CygWin only)]),
339343
[parport_use_giveio=$enableval], [parport_use_giveio=])
340344

341-
AC_ARG_ENABLE([amtjtagaccel],
342-
AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]),
343-
[build_amtjtagaccel=$enableval], [build_amtjtagaccel=no])
344-
345345
AS_CASE(["${host_cpu}"],
346346
[arm*|aarch64], [
347347
AC_ARG_ENABLE([bcm2835gpio],
@@ -576,12 +576,6 @@ AS_IF([test "x$parport_use_giveio" = "xyes"], [
576576
AC_DEFINE([PARPORT_USE_GIVEIO], [0], [0 if you don't want parport to use giveio.])
577577
])
578578

579-
AS_IF([test "x$build_amtjtagaccel" = "xyes"], [
580-
AC_DEFINE([BUILD_AMTJTAGACCEL], [1], [1 if you want the Amontec JTAG-Accelerator driver.])
581-
], [
582-
AC_DEFINE([BUILD_AMTJTAGACCEL], [0], [0 if you don't want the Amontec JTAG-Accelerator driver.])
583-
])
584-
585579
AS_IF([test "x$build_gw16012" = "xyes"], [
586580
AC_DEFINE([BUILD_GW16012], [1], [1 if you want the Gateworks GW16012 driver.])
587581
], [
@@ -719,6 +713,7 @@ PROCESS_ADAPTERS([JTAG_DPI_ADAPTER], [true], [unused])
719713
PROCESS_ADAPTERS([JTAG_VPI_ADAPTER], [true], [unused])
720714
PROCESS_ADAPTERS([RSHIM_ADAPTER], ["x$can_build_rshim" = "xyes"],
721715
[internal error: validation should happen beforehand])
716+
PROCESS_ADAPTERS([AMTJTAGACCEL_ADAPTER], [true], [unused])
722717
PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused])
723718

724719
AS_IF([test "x$enable_linuxgpiod" != "xno"], [
@@ -771,7 +766,6 @@ AM_CONDITIONAL([IMX_GPIO], [test "x$build_imx_gpio" = "xyes"])
771766
AM_CONDITIONAL([AM335XGPIO], [test "x$build_am335xgpio" = "xyes"])
772767
AM_CONDITIONAL([BITBANG], [test "x$build_bitbang" = "xyes"])
773768
AM_CONDITIONAL([USB_BLASTER_DRIVER], [test "x$enable_usb_blaster" != "xno" -o "x$enable_usb_blaster_2" != "xno"])
774-
AM_CONDITIONAL([AMTJTAGACCEL], [test "x$build_amtjtagaccel" = "xyes"])
775769
AM_CONDITIONAL([GW16012], [test "x$build_gw16012" = "xyes"])
776770
AM_CONDITIONAL([SYSFSGPIO], [test "x$build_sysfsgpio" = "xyes"])
777771
AM_CONDITIONAL([USE_LIBUSB1], [test "x$use_libusb1" = "xyes"])
@@ -877,6 +871,7 @@ m4_foreach([adapter], [USB1_ADAPTERS,
877871
JTAG_DPI_ADAPTER,
878872
JTAG_VPI_ADAPTER,
879873
RSHIM_ADAPTER,
874+
AMTJTAGACCEL_ADAPTER,
880875
DUMMY_ADAPTER,
881876
OPTIONAL_LIBRARIES,
882877
COVERAGE],

0 commit comments

Comments
 (0)