This is an automated email from Gerrit.
"zapb <d...@zapb.de>" just uploaded a new patch set to Gerrit, which you can
find at https://review.openocd.org/c/openocd/+/8428
-- gerrit
commit 9916cbe1fd5961770ba51c24bed8230c529d0b50
Author: Marc Schink <d...@zapb.de>
Date: Wed Jul 3 09:22:23 2024 +0200
Drop libjaylink Git submodule
Building libjaylink as Git submodule is announced to be deprecated since
OpenOCD v0.13.0 release, drop it.
Change-Id: I209eda9c51930d187c99ac333f0a21fa577a2d16
Signed-off-by: Marc Schink <d...@zapb.de>
diff --git a/.gitmodules b/.gitmodules
index f2da17ed7a..56a49139ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
[submodule "jimtcl"]
path = jimtcl
url = https://github.com/msteveb/jimtcl.git
-[submodule "src/jtag/drivers/libjaylink"]
- path = src/jtag/drivers/libjaylink
- url = https://gitlab.zapb.de/libjaylink/libjaylink.git
diff --git a/configure.ac b/configure.ac
index b7aed245e6..aef727f3c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,11 +379,6 @@ AC_ARG_ENABLE([jimtcl-maintainer],
AS_HELP_STRING([--enable-jimtcl-maintainer], [Enable maintainer mode when
building internal jimtcl]),
[use_internal_jimtcl_maintainer=$enableval],
[use_internal_jimtcl_maintainer=no])
-AC_ARG_ENABLE([internal-libjaylink],
- AS_HELP_STRING([--enable-internal-libjaylink],
- [Enable building internal libjaylink]),
- [use_internal_libjaylink=$enableval], [use_internal_libjaylink=no])
-
AC_ARG_ENABLE([remote-bitbang],
AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the
Remote Bitbang driver]),
[build_remote_bitbang=$enableval], [build_remote_bitbang=no])
@@ -717,7 +712,7 @@ PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" =
"xyes" -a "x$use_libu
PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi])
PROCESS_ADAPTERS([LIBFTDI_USB1_ADAPTERS], ["x$use_libftdi" = "xyes" -a
"x$use_libusb1" = "xyes"], [libftdi and libusb-1.x])
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([LIBJAYLINK_ADAPTERS], ["x$use_libjaylink" = "xyes"],
[libjaylink-0.2])
PROCESS_ADAPTERS([DUMMY_ADAPTER], [true], [unused])
AS_IF([test "x$enable_linuxgpiod" != "xno"], [
@@ -735,17 +730,6 @@ AM_CONDITIONAL([HLADAPTER_STLINK], [test "x$enable_stlink"
!= "xno"])
AM_CONDITIONAL([HLADAPTER_ICDI], [test "x$enable_ti_icdi" != "xno"])
AM_CONDITIONAL([HLADAPTER_NULINK], [test "x$enable_nulink" != "xno"])
-AS_IF([test "x$enable_jlink" != "xno"], [
- AS_IF([test "x$use_internal_libjaylink" = "xyes"], [
- AS_IF([test -f "$srcdir/src/jtag/drivers/libjaylink/configure.ac"], [
- AX_CONFIG_SUBDIR_OPTION([src/jtag/drivers/libjaylink],
- [--enable-subproject-build])
- ], [
- AC_MSG_ERROR([Internal libjaylink not found, run 'git submodule init'
and 'git submodule update'.])
- ])
- ])
-])
-
# Presto needs the bitq module
AS_IF([test "x$enable_presto" != "xno"], [
build_bitq=yes
@@ -788,10 +772,8 @@ AM_CONDITIONAL([USE_LIBJAYLINK], [test "x$use_libjaylink"
= "xyes"])
AM_CONDITIONAL([RSHIM], [test "x$build_rshim" = "xyes"])
AM_CONDITIONAL([DMEM], [test "x$build_dmem" = "xyes"])
AM_CONDITIONAL([HAVE_CAPSTONE], [test "x$enable_capstone" != "xno"])
-
AM_CONDITIONAL([INTERNAL_JIMTCL], [test "x$use_internal_jimtcl" = "xyes"])
AM_CONDITIONAL([HAVE_JIMTCL_PKG_CONFIG], [test "x$have_jimtcl_pkg_config" =
"xyes"])
-AM_CONDITIONAL([INTERNAL_LIBJAYLINK], [test "x$use_internal_libjaylink" =
"xyes"])
# Look for environ alternatives. Possibility #1: is environ in unistd.h or
stdlib.h?
AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
@@ -852,11 +834,6 @@ AC_CONFIG_FILES([
])
AC_OUTPUT
-AS_IF([test "x$enable_jlink" != "xno"], [
- AS_IF([test "x$use_internal_libjaylink" = "xyes"], [
- AC_MSG_WARN([Using the internal libjaylink is deprecated and will not be
possible in the future.])
- ]])
-)
echo
echo
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index e404afe9f0..bb09443917 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -52,13 +52,6 @@ endif
if JLINK
DRIVERFILES += %D%/jlink.c
-if INTERNAL_LIBJAYLINK
-SUBDIRS += %D%/libjaylink
-DIST_SUBDIRS += %D%/libjaylink
-
-%C%_libocdjtagdrivers_la_LIBADD += %D%/libjaylink/libjaylink/libjaylink.la
-%C%_libocdjtagdrivers_la_CPPFLAGS += -I$(builddir)/%D%/libjaylink/libjaylink
-I$(srcdir)/%D%/libjaylink
-endif
endif
if BITBANG
diff --git a/src/jtag/drivers/libjaylink b/src/jtag/drivers/libjaylink
deleted file mode 160000
index 0d23921a05..0000000000
--- a/src/jtag/drivers/libjaylink
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0d23921a05d5d427332a142d154c213d0c306eb1
--
