Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-45-g25218e893
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-03-19 21:57:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via 25218e8935037367e419219f8c855d92a3163023 (commit)
via b0fe92dba7c01adc25e5fe3552253a4a8c69ae1a (commit)
via 58b95eac48cf0ad3316a911ddc79ce8973b88fd1 (commit)
from 26a57b06cf3a11a5c002f0f85a2f3f4a05f630f7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 25218e8935037367e419219f8c855d92a3163023
Author: Antonio Borneo <bor...@gm...>
Date: Tue Nov 3 16:50:49 2020 +0100
jtag: remove minidriver code and minidriver-dummy
With zy1000 removed, there is no other implementation that uses
the minidriver, apart from the test/example minidriver-dummy.
While the idea of the minidriver is probably still valid (that is
to intercept jtag primitives before serialization), there is no
current use case, no guarantee it is really working, and the way
it was implemented (by macros and #if conditionals) is really hard
to maintain and test.
Let's let it rip in git history, from where it could eventually be
taken back in a more modern implementation.
The entry points of minidriver API are still in the code with the
original names.
Change-Id: I882e32cb26cf5842f9cba14e3badaf8948e3760d
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6091
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/configure.ac b/configure.ac
index 71cfe21d6..269452bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,10 +351,6 @@ AS_CASE([$host_os],
])
])
-AC_ARG_ENABLE([minidriver_dummy],
- AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]),
- [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no])
-
AC_ARG_ENABLE([internal-jimtcl],
AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal jimtcl]),
[use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes])
@@ -364,33 +360,10 @@ AC_ARG_ENABLE([internal-libjaylink],
[Disable building internal libjaylink]),
[use_internal_libjaylink=$enableval], [use_internal_libjaylink=yes])
-build_minidriver=no
-
AC_ARG_ENABLE([remote-bitbang],
AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang jtag driver]),
[build_remote_bitbang=$enableval], [build_remote_bitbang=no])
-AC_MSG_CHECKING([whether to enable dummy minidriver])
-AS_IF([test "x$build_minidriver_dummy" = "xyes"], [
- AS_IF([test "x$build_minidriver" = "xyes"], [
- AC_MSG_ERROR([Multiple minidriver options have been enabled.])
- ])
- build_minidriver=yes
- AC_DEFINE([BUILD_MINIDRIVER_DUMMY], [1], [Use the dummy minidriver.])
- AC_DEFINE([HAVE_JTAG_MINIDRIVER_H], [1],
- [Define to 1 if you have the <jtag_minidriver.h> header file.])
-])
-AC_MSG_RESULT([$build_minidriver_dummy])
-
-AC_MSG_CHECKING([whether standard drivers can be built])
-AS_IF([test "x$build_minidriver" = "xyes"], [
- AC_MSG_RESULT([no])
- AC_MSG_WARN([Using the minidriver disables all other drivers.])
- sleep 2
-], [
- AC_MSG_RESULT([yes])
-])
-
AS_CASE(["${host_cpu}"],
[i?86|x86*], [],
[
@@ -745,9 +718,6 @@ AM_CONDITIONAL([USE_LIBJAYLINK], [test "x$use_libjaylink" = "xyes"])
AM_CONDITIONAL([RSHIM], [test "x$build_rshim" = "xyes"])
AM_CONDITIONAL([HAVE_CAPSTONE], [test "x$enable_capstone" != "xno"])
-AM_CONDITIONAL([MINIDRIVER], [test "x$build_minidriver" = "xyes"])
-AM_CONDITIONAL([MINIDRIVER_DUMMY], [test "x$build_minidriver_dummy" = "xyes"])
-
AM_CONDITIONAL([INTERNAL_JIMTCL], [test "x$use_internal_jimtcl" = "xyes"])
AM_CONDITIONAL([INTERNAL_LIBJAYLINK], [test "x$use_internal_libjaylink" = "xyes"])
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 8bc87a484..4ed5e7aa0 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -3,29 +3,6 @@ noinst_LTLIBRARIES += %D%/libjtag.la
JTAG_SRCS = %D%/commands.c
%C%_libjtag_la_LIBADD =
-BUILT_SOURCES += %D%/minidriver_imp.h
-CLEANFILES += %D%/minidriver_imp.h
-
-if MINIDRIVER
-
-if MINIDRIVER_DUMMY
-JTAG_SRCS += %D%/minidummy/minidummy.c
-JTAG_MINIDRIVER_DIR = %D%/minidummy
-endif
-
-MINIDRIVER_IMP_DIR = %D%/minidriver
-
-%D%/jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
- cp $< $@
-
-BUILT_SOURCES += %D%/jtag_minidriver.h
-
-CLEANFILES += %D%/jtag_minidriver.h
-
-else
-
-MINIDRIVER_IMP_DIR = %D%/drivers
-
if HLADAPTER
include %D%/hla/Makefile.am
%C%_libjtag_la_LIBADD += $(top_builddir)/%D%/hla/libocdhla.la
@@ -39,13 +16,6 @@ endif
include %D%/drivers/Makefile.am
%C%_libjtag_la_LIBADD += $(top_builddir)/%D%/drivers/libocdjtagdrivers.la
-endif
-# endif // MINIDRIVER
-
-%D%/minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
- cp $< $@
-
-
%C%_libjtag_la_SOURCES = \
%D%/adapter.c \
%D%/core.c \
@@ -59,8 +29,6 @@ endif
%D%/interfaces.h \
%D%/minidriver.h \
%D%/jtag.h \
- %D%/minidriver/minidriver_imp.h \
- %D%/minidummy/jtag_minidriver.h \
%D%/swd.h \
%D%/swim.h \
%D%/tcl.h \
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index af75917a3..cf579ede0 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -497,7 +497,6 @@ COMMAND_HANDLER(handle_adapter_reset_de_assert)
(srst == VALUE_DEASSERT) ? SRST_DEASSERT : SRST_ASSERT);
}
-#ifndef HAVE_JTAG_MINIDRIVER_H
#ifdef HAVE_LIBUSB_GET_PORT_NUMBERS
COMMAND_HANDLER(handle_usb_location_command)
{
@@ -522,7 +521,6 @@ static const struct command_registration adapter_usb_command_handlers[] = {
#endif /* HAVE_LIBUSB_GET_PORT_NUMBERS */
COMMAND_REGISTRATION_DONE
};
-#endif /* MINIDRIVER */
static const struct command_registration adapter_srst_command_handlers[] = {
{
@@ -588,7 +586,6 @@ static const struct command_registration adapter_command_handlers[] = {
.help = "Declare transports the adapter supports.",
.usage = "transport ... ",
},
-#ifndef HAVE_JTAG_MINIDRIVER_H
{
.name = "usb",
.mode = COMMAND_ANY,
@@ -596,7 +593,6 @@ static const struct command_registration adapter_command_handlers[] = {
.usage = "",
.chain = adapter_usb_command_handlers,
},
-#endif /* MINIDRIVER */
{
.name = "assert",
.handler = handle_adapter_reset_de_assert,
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 5abf832f8..6604c5ae8 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -426,7 +426,6 @@ static void jtag_add_scan_check(struct jtag_tap *active, void (*jtag_add_scan)(
for (int i = 0; i < in_num_fields; i++) {
if ((in_fields[i].check_value != NULL) && (in_fields[i].in_value != NULL)) {
- /* this is synchronous for a minidriver */
jtag_add_callback4(jtag_check_value_mask_callback,
(jtag_callback_data_t)in_fields[i].in_value,
(jtag_callback_data_t)in_fields[i].check_value,
@@ -953,12 +952,6 @@ int default_interface_jtag_execute_queue(void)
int result = jtag->jtag_ops->execute_queue();
-#if !HAVE_JTAG_MINIDRIVER_H
- /* Only build this if we use a regular driver with a command queue.
- * Otherwise jtag_command_queue won't be found at compile/link time. Its
- * definition is in jtag/commands.c, which is only built/linked by
- * jtag/Makefile.am if MINIDRIVER_DUMMY || !MINIDRIVER, but those variables
- * aren't accessible here. Use HAVE_JTAG_MINIDRIVER_H */
struct jtag_command *cmd = jtag_command_queue;
while (debug_level >= LOG_LVL_DEBUG_IO && cmd) {
switch (cmd->type) {
@@ -1017,7 +1010,6 @@ int default_interface_jtag_execute_queue(void)
}
cmd = cmd->next;
}
-#endif
return result;
}
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index d229d8cb0..63faa9561 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -42,9 +42,6 @@
* that contain an adapter_driver structure that can added to this list.
*/
-#if defined(BUILD_MINIDRIVER_DUMMY)
-extern struct adapter_driver minidummy_adapter_driver;
-#else /* standard drivers */
#if BUILD_PARPORT == 1
extern struct adapter_driver parport_adapter_driver;
#endif
@@ -150,19 +147,12 @@ extern struct adapter_driver stlink_dap_adapter_driver;
#if BUILD_RSHIM == 1
extern struct adapter_driver rshim_dap_adapter_driver;
#endif
-#endif /* standard drivers */
/**
* The list of built-in JTAG interfaces, containing entries for those
* drivers that were enabled by the @c configure script.
- *
- * The list should be defined to contain either one minidriver interface
- * or some number of standard driver interfaces, never both.
*/
struct adapter_driver *adapter_drivers[] = {
-#if defined(BUILD_MINIDRIVER_DUMMY)
- &minidummy_adapter_driver,
-#else /* standard drivers */
#if BUILD_PARPORT == 1
&parport_adapter_driver,
#endif
@@ -268,6 +258,5 @@ struct adapter_driver *adapter_drivers[] = {
#if BUILD_RSHIM == 1
&rshim_dap_adapter_driver,
#endif
-#endif /* standard drivers */
NULL,
};
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 044d7c0c2..86091e6a7 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -624,9 +624,6 @@ bool jtag_poll_get_enabled(void);
*/
void jtag_poll_set_enabled(bool value);
-
-/* The minidriver may have inline versions of some of the low
- * level APIs that are used in inner loops. */
#include <jtag/minidriver.h>
int jim_jtag_newtap(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index ad830cc13..c6fdfafd3 100644
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -45,7 +45,7 @@
/* this header will be provided by the minidriver implementation, */
/* and it may provide additional declarations that must be defined. */
-#include <jtag/minidriver_imp.h>
+#include <jtag/drivers/minidriver_imp.h>
int interface_jtag_add_ir_scan(struct jtag_tap *active,
const struct scan_field *fields,
diff --git a/src/jtag/minidriver/minidriver_imp.h b/src/jtag/minidriver/minidriver_imp.h
deleted file mode 100644
index 11d0fae72..000000000
--- a/src/jtag/minidriver/minidriver_imp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2005 by Dominic Rath <Dom...@gm...> *
- * Copyright (C) 2007,2008 Ãyvind Harboe <oyv...@zy...> *
- * Copyright (C) 2009 Zachary T Welch <zw...@su...> *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef OPENOCD_JTAG_MINIDRIVER_MINIDRIVER_IMP_H
-#define OPENOCD_JTAG_MINIDRIVER_MINIDRIVER_IMP_H
-
-#include <jtag/jtag_minidriver.h>
-
-#define jtag_add_callback(callback, in) interface_jtag_add_callback(callback, in)
-
-#define jtag_add_callback4(callback, in, data1, data2, data3) \
- interface_jtag_add_callback4(callback, in, data1, data2, data3)
-
-#endif /* OPENOCD_JTAG_MINIDRIVER_MINIDRIVER_IMP_H */
diff --git a/src/jtag/minidummy/jtag_minidriver.h b/src/jtag/minidummy/jtag_minidriver.h
deleted file mode 100644
index 1708356a5..000000000
--- a/src/jtag/minidummy/jtag_minidriver.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2007-2008 by Ãyvind Harboe *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define interface_jtag_add_callback(callback, in) callback(in)
-
-#define interface_jtag_add_callback4(callback, in, data1, data2, data3) \
- jtag_set_error(callback(in, data1, data2, data3))
diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c
deleted file mode 100644
index 7ee206732..000000000
--- a/src/jtag/minidummy/minidummy.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2007-2008 by Ãyvind Harboe *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <jtag/jtag.h>
-#include <target/embeddedice.h>
-#include <jtag/minidriver.h>
-#include <jtag/interface.h>
-
-static struct jtag_interface minidummy_interface = {
- .execute_queue = NULL,
-};
-
-struct adapter_driver minidummy_adapter_driver = {
- .name = "minidummy",
- .transports = jtag_only,
- .commands = NULL,
-
- .init = NULL,
- .quit = NULL,
- .speed = NULL,
- .khz = NULL,
- .speed_div = NULL,
- .power_dropout = NULL,
- .srst_asserted = NULL,
-
- .jtag_ops = &minidummy_interface,
-};
-
-int interface_jtag_execute_queue(void)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_ir_scan(struct jtag_tap *active, const struct scan_field *fields,
- tap_state_t state)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_plain_ir_scan(int num_bits, const uint8_t *out_bits,
- uint8_t *in_bits, tap_state_t state)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_dr_scan(struct jtag_tap *active, int num_fields,
- const struct scan_field *fields, tap_state_t state)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_plain_dr_scan(int num_bits, const uint8_t *out_bits,
- uint8_t *in_bits, tap_state_t state)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_tlr(void)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_reset(int req_trst, int req_srst)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_clocks(int num_cycles)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_sleep(uint32_t us)
-{
- jtag_sleep(us);
- return ERROR_OK;
-}
-
-int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
-{
- int state_count;
- int tms = 0;
-
- state_count = 0;
-
- tap_state_t cur_state = cmd_queue_cur_state;
-
- while (num_states) {
- if (tap_state_transition(cur_state, false) == path[state_count])
- tms = 0;
- else if (tap_state_transition(cur_state, true) == path[state_count])
- tms = 1;
- else {
- LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
- tap_state_name(cur_state), tap_state_name(path[state_count]));
- exit(-1);
- }
-
- /* synchronously do the operation here */
-
- cur_state = path[state_count];
- state_count++;
- num_states--;
- }
-
-
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state)
-{
- /* synchronously do the operation here */
-
- return ERROR_OK;
-}
-
-void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, const uint8_t *buffer,
- int little, int count)
-{
- int i;
- for (i = 0; i < count; i++) {
- embeddedice_write_reg_inner(tap, reg_addr, fast_target_buffer_get_u32(buffer, little));
- buffer += 4;
- }
-}
-
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap, uint32_t opcode,
- uint32_t *data, size_t count)
-{
- int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
- uint32_t opcode, uint32_t *data, size_t count);
- return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
-}
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 60be0096f..823ce5cc1 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -562,11 +562,7 @@ static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] = {
TAP_DRSHIFT
};
-/* This inner loop can be implemented by the minidriver, oftentimes in hardware... The
- * minidriver can call the default implementation as a fallback or implement it
- * from scratch.
- */
-int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
+static int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
uint32_t opcode,
uint32_t *data,
size_t count)
@@ -629,21 +625,6 @@ int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
return retval;
}
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
- uint32_t opcode,
- uint32_t *data,
- size_t count);
-
-#ifndef HAVE_JTAG_MINIDRIVER_H
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
- uint32_t opcode,
- uint32_t *data,
- size_t count)
-{
- return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
-}
-#endif
-
/** Execute one instruction via ITR repeatedly while
* passing data to the core via DTR on each execution.
*
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 7c53c45c5..a29508baf 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -645,7 +645,6 @@ int embeddedice_handshake(struct arm_jtag *jtag_info, int hsbit, uint32_t timeou
return ERROR_TARGET_TIMEOUT;
}
-#ifndef HAVE_JTAG_MINIDRIVER_H
/**
* This is an inner loop of the open loop DCC write of data to target
*/
@@ -660,6 +659,3 @@ void embeddedice_write_dcc(struct jtag_tap *tap,
buffer += 4;
}
}
-#else
-/* provided by minidriver */
-#endif
diff --git a/src/transport/transport.h b/src/transport/transport.h
index 6bf6aaced..e04f78063 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -98,7 +98,7 @@ bool transport_is_dapdirect_jtag(void);
bool transport_is_dapdirect_swd(void);
bool transport_is_swim(void);
-#if BUILD_HLADAPTER && !HAVE_JTAG_MINIDRIVER_H
+#if BUILD_HLADAPTER
bool transport_is_hla(void);
#else
static inline bool transport_is_hla(void)
commit b0fe92dba7c01adc25e5fe3552253a4a8c69ae1a
Author: Antonio Borneo <bor...@gm...>
Date: Sun Nov 1 12:30:27 2020 +0100
zy1000: drop the code, deprecated in v0.10.0
The code for zy1000 has been marked as deprecated in release
v0.10.0, 4 years ago.
Time to drop it!
Change-Id: I08fca2a2bf8f616f031e15fd37dac3197a40ba50
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6090
Tested-by: jenkins
diff --git a/configure.ac b/configure.ac
index 215d7a7f7..71cfe21d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,14 +283,6 @@ AC_ARG_ENABLE([amtjtagaccel],
AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]),
[build_amtjtagaccel=$enableval], [build_amtjtagaccel=no])
-AC_ARG_ENABLE([zy1000_master],
- AS_HELP_STRING([--enable-zy1000-master], [Use ZY1000 JTAG master registers]),
- [build_zy1000_master=$enableval], [build_zy1000_master=no])
-
-AC_ARG_ENABLE([zy1000],
- AS_HELP_STRING([--enable-zy1000], [Enable ZY1000 interface]),
- [build_zy1000=$enableval], [build_zy1000=no])
-
AS_CASE(["${host_cpu}"],
[arm*|aarch64], [
AC_ARG_ENABLE([bcm2835gpio],
@@ -373,16 +365,6 @@ AC_ARG_ENABLE([internal-libjaylink],
[use_internal_libjaylink=$enableval], [use_internal_libjaylink=yes])
build_minidriver=no
-AC_MSG_CHECKING([whether to enable ZY1000 minidriver])
-AS_IF([test "x$build_zy1000" = "xyes"], [
- AS_IF([test "x$build_minidriver" = "xyes"], [
- AC_MSG_ERROR([Multiple minidriver options have been enabled.])
- ])
- AC_DEFINE([HAVE_JTAG_MINIDRIVER_H], [1],
- [Define to 1 if you have the <jtag_minidriver.h> header file.])
- build_minidriver=yes
-])
-AC_MSG_RESULT([$build_zy1000])
AC_ARG_ENABLE([remote-bitbang],
AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang jtag driver]),
@@ -521,18 +503,6 @@ AS_IF([test "x$build_ep93xx" = "xyes"], [
AC_DEFINE([BUILD_EP93XX], [0], [0 if you don't want ep93xx.])
])
-AS_IF([test "x$build_zy1000" = "xyes"], [
- AC_DEFINE([BUILD_ZY1000], [1], [1 if you want ZY1000.])
-], [
- AC_DEFINE([BUILD_ZY1000], [0], [0 if you don't want ZY1000.])
-])
-
-AS_IF([test "x$build_zy1000_master" = "xyes"], [
- AC_DEFINE([BUILD_ZY1000_MASTER], [1], [1 if you want ZY1000 JTAG master registers.])
-], [
- AC_DEFINE([BUILD_ZY1000_MASTER], [0], [0 if you don't want ZY1000 JTAG master registers.])
-])
-
AS_IF([test "x$build_at91rm9200" = "xyes"], [
build_bitbang=yes
AC_DEFINE([BUILD_AT91RM9200], [1], [1 if you want at91rm9200.])
@@ -687,9 +657,6 @@ 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]).)
@@ -751,8 +718,6 @@ AM_CONDITIONAL([PARPORT], [test "x$build_parport" = "xyes"])
AM_CONDITIONAL([DUMMY], [test "x$build_dummy" = "xyes"])
AM_CONDITIONAL([GIVEIO], [test "x$parport_use_giveio" = "xyes"])
AM_CONDITIONAL([EP93XX], [test "x$build_ep93xx" = "xyes"])
-AM_CONDITIONAL([ZY1000], [test "x$build_zy1000" = "xyes"])
-AM_CONDITIONAL([ZY1000_MASTER], [test "x$build_zy1000_master" = "xyes"])
AM_CONDITIONAL([AT91RM9200], [test "x$build_at91rm9200" = "xyes"])
AM_CONDITIONAL([BCM2835GPIO], [test "x$build_bcm2835gpio" = "xyes"])
AM_CONDITIONAL([IMX_GPIO], [test "x$build_imx_gpio" = "xyes"])
@@ -867,11 +832,3 @@ m4_foreach([adapter], [USB1_ADAPTERS, USB0_ADAPTERS,
])
])
echo
-
-AS_IF([test "x$build_zy1000" = "xyes" -o "x$build_zy1000_master" = "xyes"], [
- echo 'WARNING! Deprecated configure option (--enable-zy1000, --enable-zy1000-master)'
- echo 'Support for the ZY1000 platform is deprecated and will be removed in the next'
- echo 'release. If you regularly use this platform, please report to the OpenOCD'
- echo 'Mailing List.'
- echo
-])
diff --git a/doc/manual/jtag.txt b/doc/manual/jtag.txt
index 8f0804ce9..2653fc78f 100644
--- a/doc/manual/jtag.txt
+++ b/doc/manual/jtag.txt
@@ -36,7 +36,6 @@ asynchronous transactions.
- declared in @c src/jtag/minidriver.h
- used @a only by the core and minidriver implementations:
- @c jtag_driver.c (in-tree OpenOCD drivers)
- - @c zy1000/build/include/jtag_minidriver.h (ZY1000 minidriver)
- future implementations (on other embedded hosts)
- interface device drivers do @b not need this API.
diff --git a/doc/openocd.texi b/doc/openocd.texi
index f52cfa7d9..b3fe85404 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -298,7 +298,6 @@ The OpenOCD Bug Tracker is hosted on SourceForge:
@cindex dongles
@cindex FTDI
@cindex wiggler
-@cindex zy1000
@cindex printer port
@cindex USB Adapter
@cindex RTCK
@@ -307,12 +306,7 @@ Defined: @b{dongle}: A small device that plugs into a computer and serves as
an adapter .... [snip]
In the OpenOCD case, this generally refers to @b{a small adapter} that
-attaches to your computer via USB or the parallel port. One
-exception is the Ultimate Solutions ZY1000, packaged as a small box you
-attach via an ethernet cable. The ZY1000 has the advantage that it does not
-require any drivers to be installed on the developer PC. It also has
-a built in web interface. It supports RTCK/RCLK or adaptive clocking
-and has a built-in relay to power cycle targets remotely.
+attaches to your computer via USB or the parallel port.
@section Choosing a Dongle
@@ -334,26 +328,6 @@ Ethernet port needed?
RTCK support (also known as ``adaptive clocking'')?
@end enumerate
-@section Stand-alone JTAG Probe
-
-The ZY1000 from Ultimate Solutions is technically not a dongle but a
-stand-alone JTAG probe that, unlike most dongles, doesn't require any drivers
-running on the developer's host computer.
-Once installed on a network using DHCP or a static IP assignment, users can
-access the ZY1000 probe locally or remotely from any host with access to the
-IP address assigned to the probe.
-The ZY1000 provides an intuitive web interface with direct access to the
-OpenOCD debugger.
-Users may also run a GDBSERVER directly on the ZY1000 to take full advantage
-of GCC & GDB to debug any distribution of embedded Linux or NetBSD running on
-the target.
-The ZY1000 supports RTCK & RCLK or adaptive clocking and has a built-in relay
-to power cycle the target remotely.
-
-For more information, visit:
-
-@b{ZY1000} See: @url{http://www.ultsol.com/index.php/component/content/article/8/210-zylin-zy1000-main}
-
@section USB FT2232 Based
There are many USB JTAG dongles on the market, many of them based
@@ -3222,20 +3196,6 @@ The string will be of the format "DDDD:BB:SS.F" such as "0000:65:00.1".
@end deffn
@end deffn
-@deffn {Interface Driver} {ZY1000}
-This is the Zylin ZY1000 JTAG debugger.
-@end deffn
-
-@quotation Note
-This defines some driver-specific commands,
-which are not currently documented here.
-@end quotation
-
-@deffn Command power [@option{on}|@option{off}]
-Turn power switch to target on/off.
-No arguments: print status.
-@end deffn
-
@deffn {Interface Driver} {bcm2835gpio}
This SoC is present in Raspberry Pi which is a cheap single-board computer
exposing some GPIOs on its expansion header.
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index b82914bcb..8bc87a484 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -8,10 +8,6 @@ CLEANFILES += %D%/minidriver_imp.h
if MINIDRIVER
-if ZY1000
-JTAG_SRCS += %D%/zy1000/zy1000.c
-JTAG_MINIDRIVER_DIR = %D%/zy1000
-endif
if MINIDRIVER_DUMMY
JTAG_SRCS += %D%/minidummy/minidummy.c
JTAG_MINIDRIVER_DIR = %D%/minidummy
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 061a78f9c..d229d8cb0 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -42,9 +42,7 @@
* that contain an adapter_driver structure that can added to this list.
*/
-#if BUILD_ZY1000 == 1
-extern struct adapter_driver zy1000_adapter_driver;
-#elif defined(BUILD_MINIDRIVER_DUMMY)
+#if defined(BUILD_MINIDRIVER_DUMMY)
extern struct adapter_driver minidummy_adapter_driver;
#else /* standard drivers */
#if BUILD_PARPORT == 1
@@ -162,9 +160,7 @@ extern struct adapter_driver rshim_dap_adapter_driver;
* or some number of standard driver interfaces, never both.
*/
struct adapter_driver *adapter_drivers[] = {
-#if BUILD_ZY1000 == 1
- &zy1000_adapter_driver,
-#elif defined(BUILD_MINIDRIVER_DUMMY)
+#if defined(BUILD_MINIDRIVER_DUMMY)
&minidummy_adapter_driver,
#else /* standard drivers */
#if BUILD_PARPORT == 1
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 2fa580223..044d7c0c2 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -46,15 +46,6 @@
typedef enum tap_state {
TAP_INVALID = -1,
-#if BUILD_ZY1000
- /* These are the old numbers. Leave as-is for now... */
- TAP_RESET = 0, TAP_IDLE = 8,
- TAP_DRSELECT = 1, TAP_DRCAPTURE = 2, TAP_DRSHIFT = 3, TAP_DREXIT1 = 4,
- TAP_DRPAUSE = 5, TAP_DREXIT2 = 6, TAP_DRUPDATE = 7,
- TAP_IRSELECT = 9, TAP_IRCAPTURE = 10, TAP_IRSHIFT = 11, TAP_IREXIT1 = 12,
- TAP_IRPAUSE = 13, TAP_IREXIT2 = 14, TAP_IRUPDATE = 15,
-
-#else
/* Proper ARM recommended numbers */
TAP_DREXIT2 = 0x0,
TAP_DREXIT1 = 0x1,
@@ -72,8 +63,6 @@ typedef enum tap_state {
TAP_IRUPDATE = 0xd,
TAP_IRCAPTURE = 0xe,
TAP_RESET = 0x0f,
-
-#endif
} tap_state_t;
/**
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index e5c3b0f75..f1e69e591 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -29,7 +29,7 @@ proc init_reset { mode } {
#########
# TODO: power_restore and power_dropout are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
proc power_restore {} {
echo "Sensed power restore, running reset init and halting GDB."
@@ -55,7 +55,7 @@ proc power_dropout {} {
#########
# TODO: srst_deasserted and srst_asserted are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
proc srst_deasserted {} {
echo "Sensed nSRST deasserted, running reset init and halting GDB."
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
deleted file mode 100644
index 7d1ede5d4..000000000
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2007-2010 by Ãyvind Harboe *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-/* used to test manual mode */
-#define TEST_MANUAL() 0
-#define VERBOSE(a)
-
-#if BUILD_ZY1000_MASTER
-
-#define ZY1000_PEEK(a, b) do {b = *((volatile uint32_t *)(a)); } while (0)
-#define ZY1000_POKE(a, b) do {*((volatile uint32_t *)(a)) = b; } while (0)
-extern volatile void *zy1000_jtag_master;
-#define ZY1000_JTAG_BASE ((unsigned long)zy1000_jtag_master)
-
-#else
-
-/* redirect this to TCP/IP */
-#define ZY1000_JTAG_BASE 0
-extern void zy1000_tcpout(uint32_t address, uint32_t data);
-extern uint32_t zy1000_tcpin(uint32_t address);
-#define ZY1000_PEEK(a, b) b = zy1000_tcpin(a)
-#define ZY1000_POKE(a, b) zy1000_tcpout(a, b)
-
-#endif
-
-#if BUILD_ZY1000_MASTER
-/* FIFO empty? */
-static inline void waitIdle(void)
-{
- uint32_t empty;
- do {
- ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
- } while ((empty & 0x100) == 0);
-}
-
-static inline void zy1000_flush_readqueue(void)
-{
- /* Not used w/hardware fifo */
-}
-static inline void zy1000_flush_callbackqueue(void)
-{
- /* Not used w/hardware fifo */
-}
-#else
-extern void waitIdle(void);
-void zy1000_flush_readqueue(void);
-void zy1000_flush_callbackqueue(void);
-void zy1000_jtag_add_callback4(jtag_callback_t callback,
- jtag_callback_data_t data0,
- jtag_callback_data_t data1,
- jtag_callback_data_t data2,
- jtag_callback_data_t data3);
-void zy1000_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0);
-#endif
-
-static inline void waitQueue(void)
-{
-/* waitIdle(); */
-}
-
-static inline void sampleShiftRegister(void)
-{
-#if 0
- uint32_t dummy;
- waitIdle();
- ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, dummy);
-#endif
-}
-
-static inline void setCurrentState(enum tap_state state)
-{
- uint32_t a;
- a = state;
- int repeat = 0;
- if (state == TAP_RESET) {
- /* The FPGA nor we know the current state of the CPU TAP */
- /* controller. This will move it to TAP for sure. */
- /* */
- /* 5 should be enough here, 7 is what OpenOCD uses */
- repeat = 7;
- }
- waitQueue();
- sampleShiftRegister();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | a);
-
-}
-
-/*
- * Enter state and cause repeat transitions *out* of that state. So if the endState != state, then
- * the transition from state to endState counts as a transition out of state.
- */
-static inline void shiftValueInner(const enum tap_state state,
- const enum tap_state endState,
- int repeat,
- uint32_t value)
-{
- uint32_t a, b;
- a = state;
- b = endState;
- waitQueue();
- sampleShiftRegister();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
-#if 1
-#if TEST_MANUAL()
- if ((state == TAP_DRSHIFT) && (endState != TAP_DRSHIFT)) {
- int i;
- setCurrentState(state);
- for (i = 0; i < repeat; i++) {
- int tms;
- tms = 0;
- if ((i == repeat-1) && (state != endState))
- tms = 1;
- /* shift out value */
- waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, (((value >> i)&1) << 1) | tms);
- }
- waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
- waitIdle();
- /* ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT); // set this state and things
- * break => expected */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRPAUSE); /* set this and things will
- * work => expected. Not
- * setting this is not
- * sufficient to make things
- * break. */
- setCurrentState(endState);
- } else
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
-
-#else
- /* fast version */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
-#endif
-#else
- /* maximum debug version */
- if ((repeat > 0) && ((state == TAP_DRSHIFT) || (state == TAP_SI))) {
- int i;
- /* sample shift register for every bit. */
- for (i = 0; i < repeat-1; i++) {
- sampleShiftRegister();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> i);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | a);
- }
- sampleShiftRegister();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> (repeat-1));
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | b);
- } else {
- sampleShiftRegister();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
- }
- sampleShiftRegister();
-#endif
-}
-
-#if BUILD_ZY1000_MASTER
-#define interface_jtag_add_callback(callback, in) callback(in)
-#define interface_jtag_add_callback4(callback, in, data1, data2, \
- data3) jtag_set_error(callback(in, data1, data2, data3))
-#else
-#define interface_jtag_add_callback(callback, in) zy1000_jtag_add_callback(callback, in)
-#define interface_jtag_add_callback4(callback, in, data1, data2, data3) zy1000_jtag_add_callback4( \
- callback, \
- in, \
- data1, \
- data2, \
- data3)
-#endif
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
deleted file mode 100644
index 669e6f45c..000000000
--- a/src/jtag/zy1000/zy1000.c
+++ /dev/null
@@ -1,1259 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2007-2010 by Ãyvind Harboe *
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program. If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-/* This file supports the zy1000 debugger:
- *
- * http://www.ultsol.com/index.php/component/content/article/8/33-zylin-zy1000-jtag-probe
- *
- * The zy1000 is a standalone debugger that has a web interface and
- * requires no drivers on the developer host as all communication
- * is via TCP/IP. The zy1000 gets it performance(~400-700kBytes/s
- * DCC downloads @ 16MHz target) as it has an FPGA to hardware
- * accelerate the JTAG commands, while offering *very* low latency
- * between OpenOCD and the FPGA registers.
- *
- * The disadvantage of the zy1000 is that it has a feeble CPU compared to
- * a PC(ca. 50-500 DMIPS depending on how one counts it), whereas a PC
- * is on the order of 10000 DMIPS(i.e. at a factor of 20-200).
- *
- * The zy1000 revc hardware is using an Altera Nios CPU, whereas the
- * revb is using ARM7 + Xilinx.
- *
- * See Zylin web pages or contact Zylin for more information.
- *
- * The reason this code is in OpenOCD rather than OpenOCD linked with the
- * ZY1000 code is that OpenOCD is the long road towards getting
- * libopenocd into place. libopenocd will support both low performance,
- * low latency systems(embedded) and high performance high latency
- * systems(PCs).
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <pthread.h>
-
-#include <target/embeddedice.h>
-#include <jtag/minidriver.h>
-#include <jtag/interface.h>
-#include <time.h>
-#include <helper/time_support.h>
-
-#include <netinet/tcp.h>
-
-/* Assume we're connecting to a revc w/60MHz clock. */
-#define ZYLIN_KHZ 60000
-
-/* The software needs to check if it's in RCLK mode or not */
-static bool zy1000_rclk;
-
-static int zy1000_khz(int khz, int *jtag_speed)
-{
- if (khz == 0)
- *jtag_speed = 0;
- else {
- int speed;
- /* Round speed up to nearest divisor.
- *
- * E.g. 16000kHz
- * (64000 + 15999) / 16000 = 4
- * (4 + 1) / 2 = 2
- * 2 * 2 = 4
- *
- * 64000 / 4 = 16000
- *
- * E.g. 15999
- * (64000 + 15998) / 15999 = 5
- * (5 + 1) / 2 = 3
- * 3 * 2 = 6
- *
- * 64000 / 6 = 10666
- *
- */
- speed = (ZYLIN_KHZ + (khz - 1)) / khz;
- speed = (speed + 1) / 2;
- speed *= 2;
- if (speed > 8190) {
- /* maximum dividend */
- speed = 8190;
- }
- *jtag_speed = speed;
- }
- return ERROR_OK;
-}
-
-static int zy1000_speed_div(int speed, int *khz)
-{
- if (speed == 0)
- *khz = 0;
- else
- *khz = ZYLIN_KHZ / speed;
-
- return ERROR_OK;
-}
-
-static bool readPowerDropout(void)
-{
- uint32_t state;
- /* sample and clear power dropout */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x80);
- ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
- bool powerDropout;
- powerDropout = (state & 0x80) != 0;
- return powerDropout;
-}
-
-
-static bool readSRST(void)
-{
- uint32_t state;
- /* sample and clear SRST sensing */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000040);
- ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
- bool srstAsserted;
- srstAsserted = (state & 0x40) != 0;
- return srstAsserted;
-}
-
-static int zy1000_srst_asserted(int *srst_asserted)
-{
- *srst_asserted = readSRST();
- return ERROR_OK;
-}
-
-static int zy1000_power_dropout(int *dropout)
-{
- *dropout = readPowerDropout();
- return ERROR_OK;
-}
-
-/* Wait for SRST to assert or deassert */
-static void waitSRST(bool asserted)
-{
- bool first = true;
- int64_t start = 0;
- int64_t total = 0;
- const char *mode = asserted ? "assert" : "deassert";
-
- for (;; ) {
- bool srstAsserted = readSRST();
- if ((asserted && srstAsserted) || (!asserted && !srstAsserted)) {
- if (total > 1)
- LOG_USER("SRST took %dms to %s", (int)total, mode);
- break;
- }
-
- if (first) {
- first = false;
- start = timeval_ms();
- }
-
- total = timeval_ms() - start;
-
- keep_alive();
-
- if (total > 5000) {
- LOG_ERROR("SRST took too long to %s: %" PRId64 "ms", mode, total);
- break;
- }
- }
-}
-
-void zy1000_reset(int trst, int srst)
-{
- LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
-
- /* flush the JTAG FIFO. Not flushing the queue before messing with
- * reset has such interesting bugs as causing hard to reproduce
- * RCLK bugs as RCLK will stop responding when TRST is asserted
- */
- waitIdle();
-
- if (!srst)
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000001);
- else {
- /* Danger!!! if clk != 0 when in
- * idle in TAP_IDLE, reset halt on str912 will fail.
- */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001);
-
- waitSRST(true);
- }
-
- if (!trst)
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000002);
- else {
- /* assert reset */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000002);
- }
-
- if (trst || (srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST))) {
- /* we're now in the RESET state until trst is deasserted */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_RESET);
- } else {
- /* We'll get RCLK failure when we assert TRST, so clear any false positives here */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);
- }
-
- /* wait for srst to float back up */
- if ((!srst && ((jtag_get_reset_config() & RESET_TRST_PULLS_SRST) == 0)) ||
- (!srst && !trst && (jtag_get_reset_config() & RESET_TRST_PULLS_SRST)))
- waitSRST(false);
-}
-
-int zy1000_speed(int speed)
-{
- /* flush JTAG master FIFO before setting speed */
- waitIdle();
-
- zy1000_rclk = false;
-
- if (speed == 0) {
- /*0 means RCLK*/
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x100);
- zy1000_rclk = true;
- LOG_DEBUG("jtag_speed using RCLK");
- } else {
- if (speed > 8190 || speed < 2) {
- LOG_USER(
- "valid ZY1000 jtag_speed=[8190,2]. With divisor is %dkHz / even values between 8190-2, i.e. min %dHz, max %dMHz",
- ZYLIN_KHZ,
- (ZYLIN_KHZ * 1000) / 8190,
- ZYLIN_KHZ / (2 * 1000));
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
- int khz;
- speed &= ~1;
- zy1000_speed_div(speed, &khz);
- LOG_USER("jtag_speed %d => JTAG clk=%d kHz", speed, khz);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x100);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed);
- }
- return ERROR_OK;
-}
-
-static bool savePower;
-
-static void setPower(bool power)
-{
- savePower = power;
- if (power)
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x8);
- else
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x8);
-}
-
-COMMAND_HANDLER(handle_power_command)
-{
- switch (CMD_ARGC) {
- case 1: {
- bool enable;
- COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);
- setPower(enable);
- }
- /* fall through */
- case 0:
- LOG_INFO("Target power %s", savePower ? "on" : "off");
- break;
- default:
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
- return ERROR_OK;
-}
-
-#if !BUILD_ZY1000_MASTER
-static char *tcp_server = "notspecified";
-static int jim_zy1000_server(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
-{
- if (argc != 2)
- return JIM_ERR;
-
- tcp_server = strdup(Jim_GetString(argv[1], NULL));
-
- return JIM_OK;
-}
-#endif
-
-static int zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
- int argc,
- Jim_Obj * const *argv)
-{
- if (argc != 1) {
- Jim_WrongNumArgs(interp, 1, argv, "powerstatus");
- return JIM_ERR;
- }
-
- bool dropout = readPowerDropout();
-
- Jim_SetResult(interp, Jim_NewIntObj(interp, dropout));
-
- return JIM_OK;
-}
-
-int zy1000_quit(void)
-{
-
- return ERROR_OK;
-}
-
-int interface_jtag_execute_queue(void)
-{
- uint32_t empty;
-
- waitIdle();
-
- /* We must make sure to write data read back to memory location before we return
- * from this fn
- */
- zy1000_flush_readqueue();
-
- /* and handle any callbacks... */
- zy1000_flush_callbackqueue();
-
- if (zy1000_rclk) {
- /* Only check for errors when using RCLK to speed up
- * jtag over TCP/IP
- */
- ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
- /* clear JTAG error register */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);
-
- if ((empty&0x400) != 0) {
- LOG_WARNING("RCLK timeout");
- /* the error is informative only as we don't want to break the firmware if there
- * is a false positive.
- */
- /* return ERROR_FAIL; */
- }
- }
- return ERROR_OK;
-}
-
-static void writeShiftValue(uint8_t *data, int bits);
-
-/* here we shuffle N bits out/in */
-static inline void scanBits(const uint8_t *out_value,
- uint8_t *in_value,
- int num_bits,
- bool pause_now,
- tap_state_t shiftState,
- tap_state_t end_state)
-{
- tap_state_t pause_state = shiftState;
- for (int j = 0; j < num_bits; j += 32) {
- int k = num_bits - j;
- if (k > 32) {
- k = 32;
- /* we have more to shift out */
- } else if (pause_now) {
- /* this was the last to shift out this time */
- pause_state = end_state;
- }
-
- /* we have (num_bits + 7)/8 bytes of bits to toggle out. */
- /* bits are pushed out LSB to MSB */
- uint32_t value;
- value = 0;
- if (out_value != NULL) {
- for (int l = 0; l < k; l += 8)
- value |= out_value[(j + l)/8]<<l;
- }
- /* mask away unused bits for easier debugging */
- if (k < 32)
- value &= ~(((uint32_t)0xffffffff) << k);
- else {
- /* Shifting by >= 32 is not defined by the C standard
- * and will in fact shift by &0x1f bits on nios */
- }
-
- shiftValueInner(shiftState, pause_state, k, value);
-
- if (in_value != NULL)
- writeShiftValue(in_value + (j/8), k);
- }
-}
-
-static inline void scanFields(int num_fields,
- const struct scan_field *fields,
- tap_state_t shiftState,
- tap_state_t end_state)
-{
- for (int i = 0; i < num_fields; i++) {
- scanBits(fields[i].out_value,
- fields[i].in_value,
- fields[i].num_bits,
- (i == num_fields-1),
- shiftState,
- end_state);
- }
-}
-
-int interface_jtag_add_ir_scan(struct jtag_tap *active,
- const struct scan_field *fields,
- tap_state_t state)
-{
- int scan_size = 0;
- struct jtag_tap *tap, *nextTap;
- tap_state_t pause_state = TAP_IRSHIFT;
-
- for (tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = nextTap) {
- nextTap = jtag_tap_next_enabled(tap);
- if (nextTap == NULL)
- pause_state = state;
- scan_size = tap->ir_length;
-
- /* search the list */
- if (tap == active) {
- scanFields(1, fields, TAP_IRSHIFT, pause_state);
- /* update device information */
- buf_cpy(fields[0].out_value, tap->cur_instr, scan_size);
-
- tap->bypass = 0;
- } else {
- /* if a device isn't listed, set it to BYPASS */
- assert(scan_size <= 32);
- shiftValueInner(TAP_IRSHIFT, pause_state, scan_size, 0xffffffff);
-
- /* Optimization code will check what the cur_instr is set to, so
- * we must set it to bypass value.
- */
- buf_set_ones(tap->cur_instr, tap->ir_length);
-
- tap->bypass = 1;
- }
- }
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_plain_ir_scan(int num_bits,
- const uint8_t *out_bits,
- uint8_t *in_bits,
- tap_state_t state)
-{
- scanBits(out_bits, in_bits, num_bits, true, TAP_IRSHIFT, state);
- return ERROR_OK;
-}
-
-int interface_jtag_add_dr_scan(struct jtag_tap *active,
- int num_fields,
- const struct scan_field *fields,
- tap_state_t state)
-{
- struct jtag_tap *tap, *nextTap;
- tap_state_t pause_state = TAP_DRSHIFT;
- for (tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = nextTap) {
- nextTap = jtag_tap_next_enabled(tap);
- if (nextTap == NULL)
- pause_state = state;
-
- /* Find a range of fields to write to this tap */
- if (tap == active) {
- assert(!tap->bypass);
-
- scanFields(num_fields, fields, TAP_DRSHIFT, pause_state);
- } else {
- /* Shift out a 0 for disabled tap's */
- assert(tap->bypass);
- shiftValueInner(TAP_DRSHIFT, pause_state, 1, 0);
- }
- }
- return ERROR_OK;
-}
-
-int interface_jtag_add_plain_dr_scan(int num_bits,
- const uint8_t *out_bits,
- uint8_t *in_bits,
- tap_state_t state)
-{
- scanBits(out_bits, in_bits, num_bits, true, TAP_DRSHIFT, state);
- return ERROR_OK;
-}
-
-int interface_jtag_add_tlr(void)
-{
- setCurrentState(TAP_RESET);
- return ERROR_OK;
-}
-
-int interface_jtag_add_reset(int req_trst, int req_srst)
-{
- zy1000_reset(req_trst, req_srst);
- return ERROR_OK;
-}
-
-static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t clockstate)
-{
- /* num_cycles can be 0 */
- setCurrentState(clockstate);
-
- /* execute num_cycles, 32 at the time. */
- int i;
- for (i = 0; i < num_cycles; i += 32) {
- int num;
- num = 32;
- if (num_cycles-i < num)
- num = num_cycles-i;
- shiftValueInner(clockstate, clockstate, num, 0);
- }
-
-#if !TEST_MANUAL()
- /* finish in end_state */
- setCurrentState(state);
-#else
- tap_state_t t = TAP_IDLE;
- /* test manual drive code on any target */
- int tms;
- uint8_t tms_scan = tap_get_tms_path(t, state);
- int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
-
- for (i = 0; i < tms_count; i++) {
- tms = (tms_scan >> i) & 1;
- waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms);
- }
- waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state);
-#endif
-
- return ERROR_OK;
-}
-
-int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
-{
- return zy1000_jtag_add_clocks(num_cycles, state, TAP_IDLE);
-}
-
-int interface_jtag_add_clocks(int num_cycles)
-{
- return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
-}
-
-int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state)
-{
- /*wait for the fifo to be empty*/
- waitIdle();
-
- for (unsigned i = 0; i < num_bits; i++) {
- int tms;
-
- if (((seq[i/8] >> (i % 8)) & 1) == 0)
- tms = 0;
- else
- tms = 1;
-
- waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms);
- }
-
- waitIdle();
- if (state != TAP_INVALID)
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state);
- else {
- /* this would be normal if
- * we are switching to SWD mode */
- }
- return ERROR_OK;
-}
-
-int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
-{
- int state_count;
- int tms = 0;
-
- state_count = 0;
-
- tap_state_t cur_state = cmd_queue_cur_state;
-
- uint8_t seq[16];
- memset(seq, 0, sizeof(seq));
- assert(num_states < (int)((sizeof(seq) * 8)));
-
- while (num_states) {
- if (tap_state_transition(cur_state, false) == path[state_count])
- tms = 0;
- else if (tap_state_transition(cur_state, true) == path[state_count])
- tms = 1;
- else {
- LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
- tap_state_name(cur_state), tap_state_name(path[state_count]));
- exit(-1);
- }
-
- seq[state_count/8] = seq[state_count/8] | (tms << (state_count % 8));
-
- cur_state = path[state_count];
- state_count++;
- num_states--;
- }
-
- return interface_add_tms_seq(state_count, seq, cur_state);
-}
-
-static void jtag_pre_post_bits(struct jtag_tap *tap, int *pre, int *post)
-{
- /* bypass bits before and after */
- int pre_bits = 0;
- int post_bits = 0;
-
- bool found = false;
- struct jtag_tap *cur_tap, *nextTap;
- for (cur_tap = jtag_tap_next_enabled(NULL); cur_tap != NULL; cur_tap = nextTap) {
- nextTap = jtag_tap_next_enabled(cur_tap);
- if (cur_tap == tap)
- found = true;
- else {
- if (found)
- post_bits++;
- else
- pre_bits++;
- }
- }
- *pre = pre_bits;
- *post = post_bits;
-}
-
-void embeddedice_write_dcc(struct jtag_tap *tap,
- int reg_addr,
- const uint8_t *buffer,
- int little,
- int count)
-{
-#if 0
- int i;
- for (i = 0; i < count; i++) {
- embeddedice_write_reg_inner(tap, reg_addr, fast_target_buffer_get_u32(buffer,
- little));
- buffer += 4;
- }
-#else
- int pre_bits;
- int post_bits;
- jtag_pre_post_bits(tap, &pre_bits, &post_bits);
-
- if ((pre_bits > 32) || (post_bits + 6 > 32)) {
- int i;
- for (i = 0; i < count; i++) {
- embeddedice_write_reg_inner(tap, reg_addr,
- fast_target_buffer_get_u32(buffer, little));
- buffer += 4;
- }
- } else {
- int i;
- for (i = 0; i < count; i++) {
- /* Fewer pokes means we get to use the FIFO more efficiently */
- shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, pre_bits, 0);
- shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32,
- fast_target_buffer_get_u32(buffer, little));
- /* Danger! here we need to exit into the TAP_IDLE state to make
- * DCC pick up this value.
- */
- shiftValueInner(TAP_DRSHIFT, TAP_IDLE, 6 + post_bits,
- (reg_addr | (1 << 5)));
- buffer += 4;
- }
- }
-#endif
-}
-
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
- uint32_t opcode,
- uint32_t *data,
- size_t count)
-{
- /* bypass bits before and after */
- int pre_bits;
- int post_bits;
- jtag_pre_post_bits(tap, &pre_bits, &post_bits);
- post_bits += 2;
-
- if ((pre_bits > 32) || (post_bits > 32)) {
- int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
- uint32_t opcode, uint32_t *data, size_t count);
- return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
- } else {
- static const uint8_t zero;
-
- /* FIX!!!!!! the target_write_memory() API started this nasty problem
- * with unaligned uint32_t * pointers... */
- const uint8_t *t = (const uint8_t *)data;
-
- while (--count > 0) {
-#if 1
- /* Danger! This code doesn't update cmd_queue_cur_state, so
- * invoking jtag_add_pathmove() before jtag_add_dr_scan() after
- * this loop would fail!
- */
- shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, pre_bits, 0);
-
- uint32_t value;
- value = *t++;
- value |= (*t++<<8);
- value |= (*t++<<16);
- value |= (*t++<<24);
-
- shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, value);
- /* minimum 2 bits */
- shiftValueInner(TAP_DRSHIFT, TAP_DRPAUSE, post_bits, 0);
-
- /* copy & paste from arm11_dbgtap.c */
- /* TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT,
- * TAP_DRCAPTURE, TAP_DRSHIFT */
- /* KLUDGE! we have to flush the fifo or the Nios CPU locks up.
- * This is probably a bug in the Avalon bus(cross clocking bridge?)
- * or in the jtag registers module.
- */
- waitIdle();
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
- /* we don't have to wait for the queue to empty here */
- ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT);
- waitIdle();
-#else
- static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] = {
- TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE,
- TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
- };
-
- struct scan_field fields[2] = {
- { .num_bits = 32, .out_value = t },
- { .num_bits = 2, .out_value = &zero },
- };
- t += 4;
-
- jtag_add_dr_scan(tap,
- 2,
- fields,
- TAP_IDLE);
-
- jtag_add_pathmove(ARRAY_SIZE(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
- arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
-#endif
- }
-
- struct scan_field fields[2] = {
- { .num_bits = 32, .out_value = t },
- { .num_bits = 2, .out_value = &zero },
- };
-
- /* This will happen on the last iteration updating cmd_queue_cur_state
- * so we don't have to track it during the common code path
- */
- jtag_add_dr_scan(tap,
- 2,
- fields,
- TAP_IDLE);
-
- return jtag_execute_queue();
- }
-}
-
-static const struct command_registration zy1000_commands[] = {
- {
- .name = "power",
- .handler = handle_power_command,
- .mode = COMMAND_ANY,
- .help = "Turn power switch to target on/off. "
- "With no arguments, prints status.",
- .usage = "('on'|'off)",
- },
-#if !BUILD_ZY1000_MASTER
- {
- .name = "zy1000_server",
- .mode = COMMAND_ANY,
- .jim_handler = jim_zy1000_server,
- .help = "Tcpip address for ZY1000 server.",
- .usage = "address",
- },
-#endif
- {
- .name = "powerstatus",
- .mode = COMMAND_ANY,
- .jim_handler = zylinjtag_Jim_Command_powerstatus,
- .help = "Returns power status of target",
- },
- COMMAND_REGISTRATION_DONE
-};
-
-#if !BUILD_ZY1000_MASTER
-
-static int tcp_ip = -1;
-
-/* Write large packets if we can */
-static size_t out_pos;
-static uint8_t out_buffer[16384];
-static size_t in_pos;
-static size_t in_write;
-static uint8_t in_buffer[16384];
-
-static bool flush_writes(void)
-{
- bool ok = (write(tcp_ip, out_buffer, out_pos) == (int)out_pos);
- out_pos = 0;
- return ok;
-}
-
-static bool writeLong(uint32_t l)
-{
- int i;
- for (i = 0; i < 4; i++) {
- uint8_t c = (l >> (i*8))&0xff;
- out_buffer[out_pos++] = c;
- if (out_pos >= sizeof(out_buffer)) {
- if (!flush_writes())
- return false;
- }
- }
- return true;
-}
-
-static bool readLong(uint32_t *out_data)
-{
- uint32_t data = 0;
- int i;
- for (i = 0; i < 4; i++) {
- uint8_t c;
- if (in_pos == in_write) {
- /* If we have some data that we can send, send them before
- * we wait for more data
- */
- if (out_pos > 0) {
- if (!flush_writes())
- return false;
- }
-
- /* read more */
- int t;
- t = read(tcp_ip, in_buffer, sizeof(in_buffer));
- if (t < 1)
- return false;
- in_write = (size_t) t;
- in_pos = 0;
- }
- c = in_buffer[in_pos++];
-
- data |= (c << (i*8));
- }
- *out_data = data;
- return true;
-}
-
-enum ZY1000_CMD {
- ZY1000_CMD_POKE = 0x0,
- ZY1000_CMD_PEEK = 0x8,
- ZY1000_CMD_SLEEP = 0x1,
- ZY1000_CMD_WAITIDLE = 2
-};
-
-#include <sys/socket.h> /* for socket(), connect(), send(), and recv() */
-#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */
-
-/* We initialize this late since we need to know the server address
- * first.
- */
-static void tcpip_open(void)
-{
- if (tcp_ip >= 0)
- return;
-
- struct sockaddr_in echoServAddr;/* Echo server address */
-
- /* Create a reliable, stream socket using TCP */
- tcp_ip = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (tcp_ip < 0) {
- fprintf(stderr, "Failed to connect to zy1000 server\n");
- exit(-1);
- }
-
- /* Construct the server address structure */
- memset(&echoServAddr, 0, sizeof(echoServAddr)); /* Zero out structure */
- echoServAddr.sin_family = AF_INET; /* Internet address family */
- echoServAddr.sin_addr.s_addr = inet_addr(tcp_server); /* Server IP address */
- echoServAddr.sin_port = htons(7777); /* Server port */
-
- /* Establish t...
[truncated message content] |
