Menu
▾
▴
[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-42-g26a57b06c
|
From: OpenOCD-Gerrit <ope...@us...> - 2021-03-19 21:56:20
|
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 26a57b06cf3a11a5c002f0f85a2f3f4a05f630f7 (commit)
via 113f949ac11f28e4e653824bed11e48a2c699559 (commit)
via 64b486e74f9e492da2922cab127f6dcd454474fb (commit)
via 70ead8ff5d2af43aa79fbc14f80fe370d569df52 (commit)
from d02e29dabaff43bf5fb2aa2ea7778ace2223545d (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 26a57b06cf3a11a5c002f0f85a2f3f4a05f630f7
Author: Antonio Borneo <bor...@gm...>
Date: Sun Nov 1 10:41:47 2020 +0100
oocd_trace: drop the code, deprecated in v0.10.0
The code for oocd_trace has been marked as deprecated in release
v0.10.0, 4 years ago.
Time to drop it!
Change-Id: I989f8345dee4ff2369bcf5e2e2ace86bbd5aa6a5
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6088
Tested-by: jenkins
diff --git a/configure.ac b/configure.ac
index a8c2e9daf..7b5551656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,11 +328,6 @@ AC_ARG_ENABLE([gw16012],
AS_HELP_STRING([--enable-gw16012], [Enable building support for the Gateworks GW16012 JTAG Programmer]),
[build_gw16012=$enableval], [build_gw16012=no])
-AC_ARG_ENABLE([oocd_trace],
- AS_HELP_STRING([--enable-oocd_trace],
- [Enable building support for some prototype OpenOCD+trace ETM capture hardware]),
- [build_oocd_trace=$enableval], [build_oocd_trace=no])
-
AC_ARG_ENABLE([buspirate],
AS_HELP_STRING([--enable-buspirate], [Enable building support for the Buspirate]),
[build_buspirate=$enableval], [build_buspirate=no])
@@ -600,12 +595,6 @@ AS_IF([test "x$build_gw16012" = "xyes"], [
AC_DEFINE([BUILD_GW16012], [0], [0 if you don't want the Gateworks GW16012 driver.])
])
-AS_IF([test "x$build_oocd_trace" = "xyes"], [
- AC_DEFINE([BUILD_OOCD_TRACE], [1], [1 if you want the OpenOCD+trace ETM capture driver.])
-], [
- AC_DEFINE([BUILD_OOCD_TRACE], [0], [0 if you don't want the OpenOCD+trace ETM capture driver.])
-])
-
AS_IF([test "x$build_buspirate" = "xyes"], [
AC_DEFINE([BUILD_BUSPIRATE], [1], [1 if you want the Buspirate JTAG driver.])
], [
@@ -778,7 +767,6 @@ AM_CONDITIONAL([JTAG_DPI], [test "x$build_jtag_dpi" = "xyes" -o "x$build_jtag_dp
AM_CONDITIONAL([USB_BLASTER_DRIVER], [test "x$enable_usb_blaster" != "xno" -o "x$enable_usb_blaster_2" != "xno"])
AM_CONDITIONAL([AMTJTAGACCEL], [test "x$build_amtjtagaccel" = "xyes"])
AM_CONDITIONAL([GW16012], [test "x$build_gw16012" = "xyes"])
-AM_CONDITIONAL([OOCD_TRACE], [test "x$build_oocd_trace" = "xyes"])
AM_CONDITIONAL([REMOTE_BITBANG], [test "x$build_remote_bitbang" = "xyes"])
AM_CONDITIONAL([BUSPIRATE], [test "x$build_buspirate" = "xyes"])
AM_CONDITIONAL([SYSFSGPIO], [test "x$build_sysfsgpio" = "xyes"])
@@ -885,13 +873,6 @@ m4_foreach([adapter], [USB1_ADAPTERS, USB0_ADAPTERS,
])
echo
-AS_IF([test "x$build_oocd_trace" = "xyes"], [
- echo 'WARNING! Deprecated configure option (--enable-oocd_trace)'
- echo 'The oocd_trace driver is deprecated and will be removed in the next release.'
- echo 'If you regularly use this driver, please report to the OpenOCD Mailing List.'
- 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'
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 34168fdaa..06d90faca 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -8866,29 +8866,6 @@ how the event caused trouble.
@end deffn
-@deffn {Trace Port Driver} oocd_trace
-This driver isn't available unless OpenOCD was explicitly configured
-with the @option{--enable-oocd_trace} option. You probably don't want
-to configure it unless you've built the appropriate prototype hardware;
-it's @emph{proof-of-concept} software.
-
-Use the @option{oocd_trace} driver if you are configuring an ETM that's
-connected to an off-chip trace connector.
-
-@deffn {Config Command} {oocd_trace config} target tty
-Associates the ETM for @var{target} with a trace driver which
-collects data through the serial port @var{tty}.
-@end deffn
-
-@deffn Command {oocd_trace resync}
-Re-synchronizes with the capture clock.
-@end deffn
-
-@deffn Command {oocd_trace status}
-Reports whether the capture clock is locked or not.
-@end deffn
-@end deffn
-
@anchor{armcrosstrigger}
@section ARM Cross-Trigger Interface
@cindex CTI
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 6605b678b..34a78517a 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -1,9 +1,3 @@
-if OOCD_TRACE
-OOCD_TRACE_FILES = %D%/oocd_trace.c
-else
-OOCD_TRACE_FILES =
-endif
-
%C%_libtarget_la_LIBADD = %D%/openrisc/libopenrisc.la \
%D%/riscv/libriscv.la
@@ -111,7 +105,6 @@ ARM_DEBUG_SRC = \
%D%/trace.c \
%D%/etb.c \
%D%/etm.c \
- $(OOCD_TRACE_FILES) \
%D%/etm_dummy.c \
%D%/arm_tpiu_swo.c \
%D%/arm_cti.c
@@ -225,7 +218,6 @@ ARC_SRC = \
%D%/mips32_pracc.h \
%D%/mips32_dmaacc.h \
%D%/mips64_pracc.h \
- %D%/oocd_trace.h \
%D%/register.h \
%D%/target.h \
%D%/target_type.h \
diff --git a/src/target/etm.c b/src/target/etm.c
index faa941fed..19f3691bd 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -27,11 +27,6 @@
#include "register.h"
#include "etm_dummy.h"
-#if BUILD_OOCD_TRACE == 1
-#include "oocd_trace.h"
-#endif
-
-
/*
* ARM "Embedded Trace Macrocell" (ETM) support -- direct JTAG access.
*
@@ -642,9 +637,6 @@ static int etm_write_reg(struct reg *reg, uint32_t value)
static struct etm_capture_driver *etm_capture_drivers[] = {
&etb_capture_driver,
&etm_dummy_capture_driver,
-#if BUILD_OOCD_TRACE == 1
- &oocd_trace_capture_driver,
-#endif
NULL
};
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
deleted file mode 100644
index f38916a0b..000000000
--- a/src/target/oocd_trace.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2007 by Dominic Rath *
- * Dom...@gm... *
- * *
- * 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 "arm.h"
-#include "etm.h"
-#include "oocd_trace.h"
-
-/*
- * This is "proof of concept" code, for prototype hardware:
- * https://lists.berlios.de/pipermail/openocd-development/2007-September/000336.html
- */
-
-static int oocd_trace_read_reg(struct oocd_trace *oocd_trace, int reg, uint32_t *value)
-{
- size_t bytes_written, bytes_read, bytes_to_read;
- uint8_t cmd;
-
- cmd = 0x10 | (reg & 0x7);
- bytes_written = write(oocd_trace->tty_fd, &cmd, 1);
- if (bytes_written < 1)
- return ERROR_FAIL;
-
- bytes_to_read = 4;
- while (bytes_to_read > 0) {
- bytes_read = read(oocd_trace->tty_fd, ((uint8_t *)value) + 4 - bytes_to_read, bytes_to_read);
- bytes_to_read -= bytes_read;
- }
-
- LOG_DEBUG("reg #%i: 0x%8.8x", reg, *value);
-
- return ERROR_OK;
-}
-
-static int oocd_trace_write_reg(struct oocd_trace *oocd_trace, int reg, uint32_t value)
-{
- size_t bytes_written;
- uint8_t data[5];
-
- data[0] = 0x18 | (reg & 0x7);
- data[1] = value & 0xff;
- data[2] = (value & 0xff00) >> 8;
- data[3] = (value & 0xff0000) >> 16;
- data[4] = (value & 0xff000000) >> 24;
-
- bytes_written = write(oocd_trace->tty_fd, data, 5);
- if (bytes_written < 5)
- return ERROR_FAIL;
-
- LOG_DEBUG("reg #%i: 0x%8.8x", reg, value);
-
- return ERROR_OK;
-}
-
-static int oocd_trace_read_memory(struct oocd_trace *oocd_trace, uint8_t *data, uint32_t address, uint32_t size)
-{
- size_t bytes_written, bytes_to_read;
- ssize_t bytes_read;
- uint8_t cmd;
-
- oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, address);
- oocd_trace_write_reg(oocd_trace, OOCD_TRACE_SDRAM_COUNTER, size);
-
- cmd = 0x20;
- bytes_written = write(oocd_trace->tty_fd, &cmd, 1);
- if (bytes_written < 1)
- return ERROR_FAIL;
-
- bytes_to_read = size * 16;
- while (bytes_to_read > 0) {
- bytes_read = read(oocd_trace->tty_fd,
- ((uint8_t *)data) + (size * 16) - bytes_to_read, bytes_to_read);
- if (bytes_read < 0)
- LOG_DEBUG("read() returned %zi (%s)", bytes_read, strerror(errno));
- else
- bytes_to_read -= bytes_read;
- }
-
- return ERROR_OK;
-}
-
-static int oocd_trace_init(struct etm_context *etm_ctx)
-{
- uint8_t trash[256];
- struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
- size_t bytes_read;
-
- oocd_trace->tty_fd = open(oocd_trace->tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
-
- if (oocd_trace->tty_fd < 0) {
- LOG_ERROR("can't open tty");
- return ERROR_ETM_CAPTURE_INIT_FAILED;
- }
-
- /* clear input & output buffers, then switch to "blocking mode" */
- tcflush(oocd_trace->tty_fd, TCOFLUSH);
- tcflush(oocd_trace->tty_fd, TCIFLUSH);
- fcntl(oocd_trace->tty_fd, F_SETFL, fcntl(oocd_trace->tty_fd, F_GETFL) & ~O_NONBLOCK);
-
- tcgetattr(oocd_trace->tty_fd, &oocd_trace->oldtio); /* save current port settings */
-
- bzero(&oocd_trace->newtio, sizeof(oocd_trace->newtio));
- oocd_trace->newtio.c_cflag = CS8 | CLOCAL | CREAD | B2500000;
-
- oocd_trace->newtio.c_iflag = IGNPAR | IGNBRK | IXON | IXOFF;
- oocd_trace->newtio.c_oflag = 0;
-
- /* set input mode (non-canonical, no echo,...) */
- oocd_trace->newtio.c_lflag = 0;
-
- cfmakeraw(&oocd_trace->newtio);
- oocd_trace->newtio.c_cc[VTIME] = 1; /* inter-character timer used */
- oocd_trace->newtio.c_cc[VMIN] = 0; /* blocking read until 0 chars received */
-
- tcflush(oocd_trace->tty_fd, TCIFLUSH);
- tcsetattr(oocd_trace->tty_fd, TCSANOW, &oocd_trace->newtio);
-
- /* occasionally one bogus character is left in the input buffer
- * read up any leftover characters to ensure communication is in sync */
- do {
- bytes_read = read(oocd_trace->tty_fd, trash, sizeof(trash));
- if (bytes_read)
- LOG_DEBUG("%zi bytes read", bytes_read);
- } while (bytes_read > 0);
-
- return ERROR_OK;
-}
-
-static trace_status_t oocd_trace_status(struct etm_context *etm_ctx)
-{
- struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
- uint32_t status;
-
- oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
-
- /* if tracing is currently idle, return this information */
- if (etm_ctx->capture_status == TRACE_IDLE)
- return etm_ctx->capture_status;
- else if (etm_ctx->capture_status & TRACE_RUNNING) {
- /* check Full bit to identify an overflow */
- if (status & 0x4)
- etm_ctx->capture_status |= TRACE_OVERFLOWED;
-
- /* check Triggered bit to identify trigger condition */
- if (status & 0x2)
- etm_ctx->capture_status |= TRACE_TRIGGERED;
-
- if (status & 0x1) {
- etm_ctx->capture_status &= ~TRACE_RUNNING;
- etm_ctx->capture_status |= TRACE_COMPLETED;
- }
- }
-
- return etm_ctx->capture_status;
-}
-
-static int oocd_trace_read_trace(struct etm_context *etm_ctx)
-{
- struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
- uint32_t status, address;
- uint32_t first_frame = 0x0;
- uint32_t num_frames = 1048576;
- uint8_t *trace_data;
- uint32_t i;
-
- oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
- oocd_trace_read_reg(oocd_trace, OOCD_TRACE_ADDRESS, &address);
-
- /* check if we overflowed, and adjust first frame of the trace accordingly
- * if we didn't overflow, read only up to the frame that would be written next,
- * i.e. don't read invalid entries
- */
- if (status & 0x4)
- first_frame = address;
- else
- num_frames = address;
-
- /* read data into temporary array for unpacking
- * one frame from OpenOCD + trace corresponds to 16 trace cycles
- */
- trace_data = malloc(sizeof(uint8_t) * num_frames * 16);
- oocd_trace_read_memory(oocd_trace, trace_data, first_frame, num_frames);
-
- if (etm_ctx->trace_depth > 0)
- free(etm_ctx->trace_data);
-
- etm_ctx->trace_depth = num_frames * 16;
- etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
-
- for (i = 0; i < num_frames * 16; i++) {
- etm_ctx->trace_data[i].pipestat = (trace_data[i] & 0x7);
- etm_ctx->trace_data[i].packet = (trace_data[i] & 0x78) >> 3;
- etm_ctx->trace_data[i].flags = 0;
-
- if ((trace_data[i] & 0x80) >> 7)
- etm_ctx->trace_data[i].flags |= ETMV1_TRACESYNC_CYCLE;
-
- if (etm_ctx->trace_data[i].pipestat == STAT_TR) {
- etm_ctx->trace_data[i].pipestat = etm_ctx->trace_data[i].packet & 0x7;
- etm_ctx->trace_data[i].flags |= ETMV1_TRIGGER_CYCLE;
- }
- }
-
- free(trace_data);
-
- return ERROR_OK;
-}
-
-static int oocd_trace_start_capture(struct etm_context *etm_ctx)
-{
- struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
- uint32_t control = 0x1; /* 0x1: enabled */
- uint32_t trigger_count;
-
- if (((etm_ctx->control & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
- || ((etm_ctx->control & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT)) {
- LOG_DEBUG("OpenOCD + trace only supports normal 4-bit ETM mode");
- return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
- }
-
- if ((etm_ctx->control & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK)
- control |= 0x2; /* half rate clock, capture at twice the clock rate */
-
- /* OpenOCD + trace holds up to 16 million samples,
- * but trigger counts is set in multiples of 16 */
- trigger_count = (1048576 * /* trigger_percent */ 50) / 100;
-
- /* capturing always starts at address zero */
- oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, 0x0);
- oocd_trace_write_reg(oocd_trace, OOCD_TRACE_TRIGGER_COUNTER, trigger_count);
- oocd_trace_write_reg(oocd_trace, OOCD_TRACE_CONTROL, control);
-
- /* we're starting a new trace, initialize capture status */
- etm_ctx->capture_status = TRACE_RUNNING;
-
- return ERROR_OK;
-}
-
-static int oocd_trace_stop_capture(struct etm_context *etm_ctx)
-{
- struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
-
- /* trace stopped, just clear running flag, but preserve others */
- etm_ctx->capture_status &= ~TRACE_RUNNING;
-
- oocd_trace_write_reg(oocd_trace, OOCD_TRACE_CONTROL, 0x0);
-
- return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_oocd_trace_config_command)
-{
- struct target *target;
- struct arm *arm;
-
- if (CMD_ARGC != 2)
- return ERROR_COMMAND_SYNTAX_ERROR;
-
- target = get_current_target(CMD_CTX);
- arm = target_to_arm(target);
- if (!is_arm(arm)) {
- command_print(CMD, "current target isn't an ARM");
- return ERROR_FAIL;
- }
-
- if (arm->etm) {
- struct oocd_trace *oocd_trace = malloc(sizeof(struct oocd_trace));
-
- arm->etm->capture_driver_priv = oocd_trace;
- oocd_trace->etm_ctx = arm->etm;
-
- /* copy name of TTY device used to communicate with OpenOCD + trace */
- oocd_trace->tty = strndup(CMD_ARGV[1], 256);
- } else
- LOG_ERROR("target has no ETM defined, OpenOCD + trace left unconfigured");
-
- return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_oocd_trace_status_command)
-{
- struct target *target;
- struct arm *arm;
- struct oocd_trace *oocd_trace;
- uint32_t status;
-
- target = get_current_target(CMD_CTX);
-
- arm = target_to_arm(target);
- if (!is_arm(arm)) {
- command_print(CMD, "current target isn't an ARM");
- return ERROR_FAIL;
- }
-
- if (!arm->etm) {
- command_print(CMD, "current target doesn't have an ETM configured");
- return ERROR_FAIL;
- }
-
- if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) {
- command_print(CMD, "current target's ETM capture driver isn't 'oocd_trace'");
- return ERROR_FAIL;
- }
-
- oocd_trace = (struct oocd_trace *)arm->etm->capture_driver_priv;
-
- oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
-
- if (status & 0x8)
- command_print(CMD, "trace clock locked");
- else
- command_print(CMD, "no trace clock");
-
- return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_oocd_trace_resync_command)
-{
- struct target *target;
- struct arm *arm;
- struct oocd_trace *oocd_trace;
- size_t bytes_written;
- uint8_t cmd_array[1];
-
- target = get_current_target(CMD_CTX);
-
- arm = target_to_arm(target);
- if (!is_arm(arm)) {
- command_print(CMD, "current target isn't an ARM");
- return ERROR_FAIL;
- }
-
- if (!arm->etm) {
- command_print(CMD, "current target doesn't have an ETM configured");
- return ERROR_FAIL;
- }
-
- if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) {
- command_print(CMD, "current target's ETM capture driver isn't 'oocd_trace'");
- return ERROR_FAIL;
- }
-
- oocd_trace = (struct oocd_trace *)arm->etm->capture_driver_priv;
-
- cmd_array[0] = 0xf0;
-
- bytes_written = write(oocd_trace->tty_fd, cmd_array, 1);
- if (bytes_written < 1)
- return ERROR_FAIL;
-
- command_print(CMD, "requesting traceclock resync");
- LOG_DEBUG("resyncing traceclk pll");
-
- return ERROR_OK;
-}
-
-static const struct command_registration oocd_trace_all_command_handlers[] = {
- {
- .name = "config",
- .handler = handle_oocd_trace_config_command,
- .mode = COMMAND_CONFIG,
- .usage = "<target> <tty>",
- },
- {
- .name = "status",
- .handler = handle_oocd_trace_status_command,
- .mode = COMMAND_EXEC,
- .usage = "",
- .help = "display OpenOCD + trace status",
- },
- {
- .name = "resync",
- .handler = handle_oocd_trace_resync_command,
- .mode = COMMAND_EXEC,
- .usage = "",
- .help = "resync OpenOCD + trace capture clock",
- },
- COMMAND_REGISTRATION_DONE
-};
-static const struct command_registration oocd_trace_command_handlers[] = {
- {
- .name = "oocd_trace",
- .mode = COMMAND_ANY,
- .help = "OpenOCD trace capture driver command group",
- .usage = "",
- .chain = oocd_trace_all_command_handlers,
- },
- COMMAND_REGISTRATION_DONE
-};
-
-struct etm_capture_driver oocd_trace_capture_driver = {
- .name = "oocd_trace",
- .commands = oocd_trace_command_handlers,
- .init = oocd_trace_init,
- .status = oocd_trace_status,
- .start_capture = oocd_trace_start_capture,
- .stop_capture = oocd_trace_stop_capture,
- .read_trace = oocd_trace_read_trace,
-};
diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
deleted file mode 100644
index e7584e4c9..000000000
--- a/src/target/oocd_trace.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2007 by Dominic Rath *
- * Dom...@gm... *
- * *
- * 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_TARGET_OOCD_TRACE_H
-#define OPENOCD_TARGET_OOCD_TRACE_H
-
-#include <termios.h>
-
-/* registers */
-enum {
- OOCD_TRACE_ID = 0x7,
- OOCD_TRACE_ADDRESS = 0x0,
- OOCD_TRACE_TRIGGER_COUNTER = 0x01,
- OOCD_TRACE_CONTROL = 0x2,
- OOCD_TRACE_STATUS = 0x3,
- OOCD_TRACE_SDRAM_COUNTER = 0x4,
-};
-
-/* commands */
-enum {
- OOCD_TRACE_NOP = 0x0,
- OOCD_TRACE_READ_REG = 0x10,
- OOCD_TRACE_WRITE_REG = 0x18,
- OOCD_TRACE_READ_RAM = 0x20,
-/* OOCD_TRACE_WRITE_RAM = 0x28, */
- OOCD_TRACE_RESYNC = 0xf0,
-};
-
-struct oocd_trace {
- struct etm_context *etm_ctx;
- char *tty;
- int tty_fd;
- struct termios oldtio, newtio;
-};
-
-extern struct etm_capture_driver oocd_trace_capture_driver;
-
-#endif /* OPENOCD_TARGET_OOCD_TRACE_H */
commit 113f949ac11f28e4e653824bed11e48a2c699559
Author: Antonio Borneo <bor...@gm...>
Date: Sun Nov 1 00:14:52 2020 +0100
target: remove handling of target's deprecated_name
We do not have anymore any deprecated target name.
Drop the code to handle deprecated target names and the placehold
in struct target_type.
This patch is separated from the patch that drops the remaining
deprecated target names to be ready to revert this if there is any
need in the future.
Change-Id: I96fca7ffa39d8292f81e79f115ea45c4a30035d7
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6087
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/target/target.c b/src/target/target.c
index eb83daebb..200368b13 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5678,15 +5678,6 @@ static int target_create(Jim_GetOptInfo *goi)
/* found */
break;
}
-
- /* check for deprecated name */
- if (target_types[x]->deprecated_name) {
- if (0 == strcmp(cp, target_types[x]->deprecated_name)) {
- /* found */
- LOG_WARNING("target name is deprecated use: \'%s\'", target_types[x]->name);
- break;
- }
- }
}
if (target_types[x] == NULL) {
Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 4bdea721e..0f3df0002 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -40,7 +40,6 @@ struct target_type {
* field directly, use target_type_name() instead.
*/
const char *name;
- const char *deprecated_name;
/* poll current target status */
int (*poll)(struct target *target);
commit 64b486e74f9e492da2922cab127f6dcd454474fb
Author: Antonio Borneo <bor...@gm...>
Date: Sun Nov 1 00:10:55 2020 +0100
target: remove target names already deprecated in v0.8.0
Some target name were marked as deprecated in release v0.7.0 and
v0.8.0, almost 7 years ago, and replaced with more 'actual' names.
We can reasonably expect that in these 7 years any user of OpenOCD
has already migrated to v0.8.0 or to some newer release, thus has
already updated any local/personal script to get rid of the
deprecated message.
Drop the target names already deprecated in v0.8.0.
Change-Id: I7c7491496db1b302b4eb1e9fc6090b58d4acf05a
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6086
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Tested-by: jenkins
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index d27c298b6..5018a91d4 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -3143,7 +3143,6 @@ static const struct command_registration cortex_a_command_handlers[] = {
struct target_type cortexa_target = {
.name = "cortex_a",
- .deprecated_name = "cortex_a8",
.poll = cortex_a_poll,
.arch_state = armv7a_arch_state,
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 2a973e1f6..6dc33c867 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2501,7 +2501,6 @@ static const struct command_registration cortex_m_command_handlers[] = {
struct target_type cortexm_target = {
.name = "cortex_m",
- .deprecated_name = "cortex_m3",
.poll = cortex_m_poll,
.arch_state = armv7m_arch_state,
diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index 9ac344245..cd57dd207 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -640,7 +640,6 @@ static const struct command_registration adapter_command_handlers[] = {
struct target_type hla_target = {
.name = "hla_target",
- .deprecated_name = "stm32_stlink",
.init_target = adapter_init_target,
.deinit_target = cortex_m_deinit_target,
commit 70ead8ff5d2af43aa79fbc14f80fe370d569df52
Author: Antonio Borneo <bor...@gm...>
Date: Sat Oct 31 23:58:33 2020 +0100
startup.tcl: remove commands already deprecated in v0.7.0
Some command were already marked as deprecated in release v0.7.0,
more then 7 years ago, and for some of them the depredation date
is even earlier.
We can reasonably expect that in these 7 years any user of OpenOCD
has already migrated to v0.7.0 or to some following intermediate
build, thus has already updated any local/personal script to get
rid of the deprecated message.
Drop the commands already deprecated in v0.7.0.
Change-Id: I81cdc415ab855ebf30980ef5199f9780c5d7f932
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: http://openocd.zylin.com/6085
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tar...@gm...>
Reviewed-by: Tomas Vanek <va...@fb...>
diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl
index 280a059a3..7d9dbc7da 100644
--- a/src/flash/startup.tcl
+++ b/src/flash/startup.tcl
@@ -119,14 +119,3 @@ proc stm32g4x args { eval stm32l4x $args }
proc stm32l5x args { eval stm32l4x $args }
proc stm32wbx args { eval stm32l4x $args }
proc stm32wlx args { eval stm32l4x $args }
-
-# ease migration to updated flash driver
-proc stm32x args {
- echo "DEPRECATED! use 'stm32f1x $args' not 'stm32x $args'"
- eval stm32f1x $args
-}
-
-proc stm32f2xxx args {
- echo "DEPRECATED! use 'stm32f2x $args' not 'stm32f2xxx $args'"
- eval stm32f2x $args
-}
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 82327a39b..e5c3b0f75 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -117,23 +117,8 @@ proc jtag_ntrst_assert_width args {
# JTAG-specific names despite the fact that the operations were not
# specific to JTAG, or otherwise had troublesome/misleading names.
#
-# FIXME phase these aids out after about April 2011
+# FIXME phase these aids out after some releases
#
-proc jtag_khz args {
- echo "DEPRECATED! use 'adapter speed' not 'jtag_khz'"
- eval adapter speed $args
-}
-
-proc jtag_nsrst_delay args {
- echo "DEPRECATED! use 'adapter srst delay' not 'jtag_nsrst_delay'"
- eval adapter srst delay $args
-}
-
-proc jtag_nsrst_assert_width args {
- echo "DEPRECATED! use 'adapter srst pulse_width' not 'jtag_nsrst_assert_width'"
- eval adapter srst pulse_width $args
-}
-
proc jtag_reset args {
echo "DEPRECATED! use 'adapter \[de\]assert' not 'jtag_reset'"
switch $args {
@@ -150,32 +135,6 @@ proc jtag_reset args {
}
}
-# stlink migration helpers
-proc stlink_device_desc args {
- echo "DEPRECATED! use 'hla_device_desc' not 'stlink_device_desc'"
- eval hla_device_desc $args
-}
-
-proc stlink_serial args {
- echo "DEPRECATED! use 'hla_serial' not 'stlink_serial'"
- eval hla_serial $args
-}
-
-proc stlink_layout args {
- echo "DEPRECATED! use 'hla_layout' not 'stlink_layout'"
- eval hla_layout $args
-}
-
-proc stlink_vid_pid args {
- echo "DEPRECATED! use 'hla_vid_pid' not 'stlink_vid_pid'"
- eval hla_vid_pid $args
-}
-
-proc stlink args {
- echo "DEPRECATED! use 'hla' not 'stlink'"
- eval hla $args
-}
-
proc adapter_khz args {
echo "DEPRECATED! use 'adapter speed' not 'adapter_khz'"
eval adapter speed $args
diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index ca39b1816..a8f78ab49 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -179,12 +179,6 @@ proc using_hla {} {
#########
-# Temporary migration aid. May be removed starting in January 2011.
-proc armv4_5 params {
- echo "DEPRECATED! use 'arm $params' not 'armv4_5 $params'"
- arm $params
-}
-
# Target/chain configuration scripts can either execute commands directly
# or define a procedure which is executed once all configuration
# scripts have completed.
@@ -212,14 +206,3 @@ proc init_target_events {} {
# Additionally board config scripts can define a procedure init_board that will be executed after init and init_targets
proc init_board {} {
}
-
-# deprecated target name cmds
-proc cortex_m3 args {
- echo "DEPRECATED! use 'cortex_m' not 'cortex_m3'"
- eval cortex_m $args
-}
-
-proc cortex_a8 args {
- echo "DEPRECATED! use 'cortex_a' not 'cortex_a8'"
- eval cortex_a $args
-}
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 19 ---
doc/openocd.texi | 23 ---
src/flash/startup.tcl | 11 --
src/jtag/startup.tcl | 43 +----
src/target/Makefile.am | 8 -
src/target/cortex_a.c | 1 -
src/target/cortex_m.c | 1 -
src/target/etm.c | 8 -
src/target/hla_target.c | 1 -
src/target/oocd_trace.c | 417 -----------------------------------------------
src/target/oocd_trace.h | 53 ------
src/target/startup.tcl | 17 --
src/target/target.c | 9 -
src/target/target_type.h | 1 -
14 files changed, 1 insertion(+), 611 deletions(-)
delete mode 100644 src/target/oocd_trace.c
delete mode 100644 src/target/oocd_trace.h
hooks/post-receive
--
Main OpenOCD repository
|
