Skip to content

Commit 5e4ad24

Browse files
R. Diezborneoa
authored andcommitted
configure.ac: show vdebug in the config summary
Also enable this adapter by default (auto). Change-Id: Id011168b93c4cdc602ab78eabfb9a64ca8d8a7df Signed-off-by: R. Diez <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8601 Reviewed-by: Antonio Borneo <[email protected]> Tested-by: jenkins
1 parent 4deb76f commit 5e4ad24

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

configure.ac

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ m4_define([SERIAL_PORT_ADAPTERS],
172172

173173
m4_define([LINUXSPIDEV_ADAPTER],
174174
[[[linuxspidev], [Linux spidev driver], [LINUXSPIDEV]]])
175+
m4_define([VDEBUG_ADAPTER],
176+
[[[vdebug], [Cadence Virtual Debug Interface], [VDEBUG]]])
175177

176178
# The word 'Adapter' in "Dummy Adapter" below must begin with a capital letter
177179
# because there is an M4 macro called 'adapter'.
@@ -302,6 +304,7 @@ AC_ARG_ADAPTERS([
302304
LINUXSPIDEV_ADAPTER,
303305
SERIAL_PORT_ADAPTERS,
304306
DUMMY_ADAPTER,
307+
VDEBUG_ADAPTER,
305308
PCIE_ADAPTERS,
306309
LIBJAYLINK_ADAPTERS
307310
],[auto])
@@ -324,10 +327,6 @@ AC_ARG_ENABLE([jtag_vpi],
324327
AS_HELP_STRING([--enable-jtag_vpi], [Enable building support for JTAG VPI]),
325328
[build_jtag_vpi=$enableval], [build_jtag_vpi=no])
326329

327-
AC_ARG_ENABLE([vdebug],
328-
AS_HELP_STRING([--enable-vdebug], [Enable building support for Cadence Virtual Debug Interface]),
329-
[build_vdebug=$enableval], [build_vdebug=no])
330-
331330
AC_ARG_ENABLE([jtag_dpi],
332331
AS_HELP_STRING([--enable-jtag_dpi], [Enable building support for JTAG DPI]),
333332
[build_jtag_dpi=$enableval], [build_jtag_dpi=no])
@@ -581,12 +580,6 @@ AS_IF([test "x$build_jtag_vpi" = "xyes"], [
581580
AC_DEFINE([BUILD_JTAG_VPI], [0], [0 if you don't want JTAG VPI.])
582581
])
583582

584-
AS_IF([test "x$build_vdebug" = "xyes"], [
585-
AC_DEFINE([BUILD_VDEBUG], [1], [1 if you want Cadence vdebug interface.])
586-
], [
587-
AC_DEFINE([BUILD_VDEBUG], [0], [0 if you don't want Cadence vdebug interface.])
588-
])
589-
590583
AS_IF([test "x$build_jtag_dpi" = "xyes"], [
591584
AC_DEFINE([BUILD_JTAG_DPI], [1], [1 if you want JTAG DPI.])
592585
], [
@@ -738,6 +731,7 @@ PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes"], [Linux build])
738731
PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
739732
[internal error: validation should happen beforehand])
740733
PROCESS_ADAPTERS([LINUXSPIDEV_ADAPTER], ["x$is_linux" = "xyes"], [Linux spidev])
734+
PROCESS_ADAPTERS([VDEBUG_ADAPTER], [true], [unused])
741735
PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused])
742736

743737
AS_IF([test "x$enable_linuxgpiod" != "xno"], [
@@ -786,7 +780,6 @@ AM_CONDITIONAL([IMX_GPIO], [test "x$build_imx_gpio" = "xyes"])
786780
AM_CONDITIONAL([AM335XGPIO], [test "x$build_am335xgpio" = "xyes"])
787781
AM_CONDITIONAL([BITBANG], [test "x$build_bitbang" = "xyes"])
788782
AM_CONDITIONAL([JTAG_VPI], [test "x$build_jtag_vpi" = "xyes"])
789-
AM_CONDITIONAL([VDEBUG], [test "x$build_vdebug" = "xyes"])
790783
AM_CONDITIONAL([JTAG_DPI], [test "x$build_jtag_dpi" = "xyes"])
791784
AM_CONDITIONAL([USB_BLASTER_DRIVER], [test "x$enable_usb_blaster" != "xno" -o "x$enable_usb_blaster_2" != "xno"])
792785
AM_CONDITIONAL([AMTJTAGACCEL], [test "x$build_amtjtagaccel" = "xyes"])
@@ -892,6 +885,7 @@ m4_foreach([adapter], [USB1_ADAPTERS,
892885
LIBGPIOD_ADAPTERS,
893886
LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS, SERIAL_PORT_ADAPTERS,
894887
LINUXSPIDEV_ADAPTER,
888+
VDEBUG_ADAPTER,
895889
DUMMY_ADAPTER,
896890
OPTIONAL_LIBRARIES,
897891
COVERAGE],

0 commit comments

Comments
 (0)