diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2018-03-21 18:40:36 +0300 |
|---|---|---|
| committer | Matthias Welwarsky <matthias@welwarsky.de> | 2018-04-09 09:04:46 +0100 |
| commit | 70b15f989f09428a85d6e52d8a03dc902081eb01 (patch) | |
| tree | 371ac36f42985785020931d5126396c3ad16742e | |
| parent | dbd7e80eb47d37bb8bfc1c55f19c61f5ee561393 (diff) | |
configure: disable all drivers when zy1000 is enabled
This also fixes the transport_is_hla FIXME.
Change-Id: I33960f373f11e3e203f9aed9c6d02bf7ca48ac97
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/4473
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/transport/transport.h | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f4f66ab4..312fda8b 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 d0a77ddf..140ef503 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) |