zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
riscv-compliance-dev^2
Paul Fertser 2018-03-21 18:40:36 +03:00 committed by Tim Newsome
parent 5a591c9857
commit 74db5ad66f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -634,6 +634,9 @@ PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.2],
m4_define([PROCESS_ADAPTERS], [ m4_define([PROCESS_ADAPTERS], [
m4_foreach([adapter], [$1], [ m4_foreach([adapter], [$1], [
AS_IF([test "x$build_zy1000" = "xyes"], [
ADAPTER_VAR([adapter])=no
])
AS_IF([test $2], [ AS_IF([test $2], [
AS_IF([test "x$ADAPTER_VAR([adapter])" != "xno"], [ AS_IF([test "x$ADAPTER_VAR([adapter])" != "xno"], [
AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [1], [1 if you want the ]ADAPTER_DESC([adapter]).) AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [1], [1 if you want the ]ADAPTER_DESC([adapter]).)

5
src/transport/transport.h
View File

@ -97,10 +97,7 @@ bool transports_are_declared(void);
bool transport_is_jtag(void); bool transport_is_jtag(void);
bool transport_is_swd(void); bool transport_is_swd(void);
/* FIXME: ZY1000 test build on jenkins is configured with enabled hla adapters #if BUILD_HLADAPTER
* 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
bool transport_is_hla(void); bool transport_is_hla(void);
#else #else
static inline bool transport_is_hla(void) static inline bool transport_is_hla(void)