This is an automated email from Gerrit. "Nicolas Derumigny <nicolas.derumi...@inria.fr>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8980
-- gerrit commit de35c1b7a201a2e8e6181952cffc9a9ce711fd84 Author: Nicolas Derumigny <nicolas.derumi...@inria.fr> Date: Mon Jun 30 11:21:18 2025 +0200 driver: jtag: rename xlnx-pcie-xvc to xlnx-xvc Rename xlnx-pcie-xvc.c to xlnx-xvc.c in provision for AXI support Signed-off-by: Nicolas Derumigny <nicolas.derumi...@inria.fr> Change-Id: I287fdcb8edf97f48c6f8614ac4c456f8ba197011 diff --git a/configure.ac b/configure.ac index 453cbcfb5a..3f79622bf3 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,10 @@ m4_define([LIBJAYLINK_ADAPTERS], [[[jlink], [SEGGER J-Link Programmer], [JLINK]]]) m4_define([PCIE_ADAPTERS], - [[[xlnx_pcie_xvc], [Xilinx XVC/PCIe], [XLNX_PCIE_XVC]]]) + [[[xlnx_pcie_xvc], [Xilinx XVC/PCIe], [XLNX_XVC]]]) + +m4_define([AXI_ADAPTERS], + [[[xlnx_axi_xvc], [Xilinx XVC/AXI], [XLNX_XVC]]]) m4_define([SERIAL_PORT_ADAPTERS], [[[buspirate], [Bus Pirate], [BUS_PIRATE]]]) @@ -336,6 +339,7 @@ AC_ARG_ADAPTERS([ JTAG_VPI_ADAPTER, RSHIM_ADAPTER, PCIE_ADAPTERS, + AXI_ADAPTERS, LIBJAYLINK_ADAPTERS ],[auto]) @@ -657,6 +661,8 @@ PROCESS_ADAPTERS([RSHIM_ADAPTER], ["x$can_build_rshim" = "xyes"], PROCESS_ADAPTERS([AMTJTAGACCEL_ADAPTER], [true], [unused]) PROCESS_ADAPTERS([HOST_ARM_BITBANG_ADAPTERS], [true], [unused]) PROCESS_ADAPTERS([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS], [true], [unused]) +PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes" -a "x$use_libgpiod" = "xyes"], [Linux build and libgpiod]) +PROCESS_ADAPTERS([AXI_ADAPTERS], ["x$is_linux" = "xyes" -a "x$use_libgpiod" = "xyes"], [Linux build and libgpiod]) PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused]) AS_IF([test "x$enable_linuxgpiod" != "xno"], [ @@ -840,7 +846,8 @@ m4_foreach([adapterTuple], [USB1_ADAPTERS, DMEM_ADAPTER, SYSFSGPIO_ADAPTER, REMOTE_BITBANG_ADAPTER, - LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS, SERIAL_PORT_ADAPTERS, + LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS, + AXI_ADAPTERS, SERIAL_PORT_ADAPTERS, LINUXSPIDEV_ADAPTER, VDEBUG_ADAPTER, JTAG_DPI_ADAPTER, diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index b0dd8e3ad1..e55e0478c6 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -179,8 +179,8 @@ endif if LINUXSPIDEV DRIVERFILES += %D%/linuxspidev.c endif -if XLNX_PCIE_XVC -DRIVERFILES += %D%/xlnx-pcie-xvc.c +if XLNX_XVC +DRIVERFILES += %D%/xlnx-xvc.c endif if BCM2835GPIO DRIVERFILES += %D%/bcm2835gpio.c diff --git a/src/jtag/drivers/xlnx-pcie-xvc.c b/src/jtag/drivers/xlnx-xvc.c similarity index 100% rename from src/jtag/drivers/xlnx-pcie-xvc.c rename to src/jtag/drivers/xlnx-xvc.c --