This is an automated email from Gerrit. Paul Fertser ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/4473
-- gerrit commit f3b221a0b93961aba907f8b6cd10029d842aee73 Author: Paul Fertser <[email protected]> Date: Wed Mar 21 18:40:36 2018 +0300 configure: disable all drivers when zy1000 is enabled This also fixes the transport_is_hla FIXME. Change-Id: I33960f373f11e3e203f9aed9c6d02bf7ca48ac97 Signed-off-by: Paul Fertser <[email protected]> diff --git a/configure.ac b/configure.ac index f4f66ab..312fda8 100644 --- a/configure.ac +++ b/configure.ac @@ -634,6 +634,9 @@ PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.2], m4_define([PROCESS_ADAPTERS], [ m4_foreach([adapter], [$1], [ + AS_IF([test "x$build_zy1000" = "xyes"], [ + ADAPTER_VAR([adapter])=no + ]) AS_IF([test $2], [ AS_IF([test "x$ADAPTER_VAR([adapter])" != "xno"], [ AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [1], [1 if you want the ]ADAPTER_DESC([adapter]).) diff --git a/src/transport/transport.h b/src/transport/transport.h index d0a77dd..140ef50 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -97,10 +97,7 @@ bool transports_are_declared(void); bool transport_is_jtag(void); bool transport_is_swd(void); -/* FIXME: ZY1000 test build on jenkins is configured with enabled hla adapters - * but jtag/hla/hla_*.c files are not compiled. To workaround the problem we assume hla - * is broken if BUILD_ZY1000 is set */ -#if BUILD_HLADAPTER && !BUILD_ZY1000 +#if BUILD_HLADAPTER bool transport_is_hla(void); #else static inline bool transport_is_hla(void) -- ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
