Menu
▾
▴
openocd-commit — OpenOCD commit maling list - read only
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(75) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(70) |
Feb
(20) |
Mar
(52) |
Apr
(149) |
May
(387) |
Jun
(466) |
Jul
(133) |
Aug
(87) |
Sep
(122) |
Oct
(140) |
Nov
(185) |
Dec
(105) |
| 2010 |
Jan
(85) |
Feb
(45) |
Mar
(75) |
Apr
(17) |
May
(41) |
Jun
(52) |
Jul
(33) |
Aug
(29) |
Sep
(36) |
Oct
(15) |
Nov
(26) |
Dec
(34) |
| 2011 |
Jan
(26) |
Feb
(25) |
Mar
(26) |
Apr
(29) |
May
(20) |
Jun
(27) |
Jul
(15) |
Aug
(32) |
Sep
(13) |
Oct
(64) |
Nov
(60) |
Dec
(10) |
| 2012 |
Jan
(64) |
Feb
(63) |
Mar
(39) |
Apr
(43) |
May
(54) |
Jun
(11) |
Jul
(30) |
Aug
(45) |
Sep
(11) |
Oct
(70) |
Nov
(24) |
Dec
(23) |
| 2013 |
Jan
(17) |
Feb
(8) |
Mar
(35) |
Apr
(40) |
May
(20) |
Jun
(24) |
Jul
(36) |
Aug
(25) |
Sep
(42) |
Oct
(40) |
Nov
(9) |
Dec
(21) |
| 2014 |
Jan
(29) |
Feb
(24) |
Mar
(60) |
Apr
(22) |
May
(22) |
Jun
(46) |
Jul
(11) |
Aug
(23) |
Sep
(26) |
Oct
(10) |
Nov
(14) |
Dec
(2) |
| 2015 |
Jan
(28) |
Feb
(47) |
Mar
(33) |
Apr
(58) |
May
(5) |
Jun
(1) |
Jul
|
Aug
(8) |
Sep
(12) |
Oct
(25) |
Nov
(58) |
Dec
(21) |
| 2016 |
Jan
(12) |
Feb
(40) |
Mar
(2) |
Apr
(1) |
May
(67) |
Jun
(2) |
Jul
(5) |
Aug
(36) |
Sep
|
Oct
(24) |
Nov
(17) |
Dec
(50) |
| 2017 |
Jan
(14) |
Feb
(16) |
Mar
(2) |
Apr
(35) |
May
(14) |
Jun
(16) |
Jul
(3) |
Aug
(3) |
Sep
|
Oct
(19) |
Nov
|
Dec
(16) |
| 2018 |
Jan
(55) |
Feb
(11) |
Mar
(34) |
Apr
(14) |
May
(4) |
Jun
(20) |
Jul
(39) |
Aug
(16) |
Sep
(17) |
Oct
(16) |
Nov
(20) |
Dec
(30) |
| 2019 |
Jan
(29) |
Feb
(24) |
Mar
(37) |
Apr
(26) |
May
(19) |
Jun
(21) |
Jul
(2) |
Aug
(3) |
Sep
(9) |
Oct
(12) |
Nov
(12) |
Dec
(12) |
| 2020 |
Jan
(47) |
Feb
(36) |
Mar
(54) |
Apr
(44) |
May
(37) |
Jun
(19) |
Jul
(32) |
Aug
(13) |
Sep
(16) |
Oct
(24) |
Nov
(32) |
Dec
(11) |
| 2021 |
Jan
(14) |
Feb
(5) |
Mar
(40) |
Apr
(32) |
May
(42) |
Jun
(31) |
Jul
(29) |
Aug
(47) |
Sep
(38) |
Oct
(17) |
Nov
(74) |
Dec
(33) |
| 2022 |
Jan
(11) |
Feb
(15) |
Mar
(40) |
Apr
(21) |
May
(39) |
Jun
(44) |
Jul
(19) |
Aug
(46) |
Sep
(79) |
Oct
(35) |
Nov
(21) |
Dec
(15) |
| 2023 |
Jan
(56) |
Feb
(13) |
Mar
(43) |
Apr
(28) |
May
(60) |
Jun
(15) |
Jul
(29) |
Aug
(28) |
Sep
(32) |
Oct
(21) |
Nov
(42) |
Dec
(39) |
| 2024 |
Jan
(35) |
Feb
(17) |
Mar
(28) |
Apr
(7) |
May
(14) |
Jun
(35) |
Jul
(30) |
Aug
(35) |
Sep
(30) |
Oct
(28) |
Nov
(38) |
Dec
(18) |
| 2025 |
Jan
(21) |
Feb
(28) |
Mar
(36) |
Apr
(35) |
May
(34) |
Jun
(58) |
Jul
(9) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:48:28
|
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 b04a58e3fcbfd9a701126473279fa17d37f23784 (commit)
via df42faf51d20d879beefacbd88b11271bcee181a (commit)
from c5babec7949d3fc23fd3fe43d5452897b7c94553 (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 b04a58e3fcbfd9a701126473279fa17d37f23784
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:46:03 2024 +0100
target: esirisc: make local functions static
The function esirisc_jtag_get_eid() is not used outside the file.
Make it static.
The function esirisc_jtag_disable_debug() is never used.
Make it static and mark it as unused.
Change-Id: I5c99cbf77cc9c527b6e18a3f67caa24f8551d09c
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8550
Tested-by: jenkins
diff --git a/src/target/esirisc_jtag.c b/src/target/esirisc_jtag.c
index 5960e26cb..ad2bef543 100644
--- a/src/target/esirisc_jtag.c
+++ b/src/target/esirisc_jtag.c
@@ -19,6 +19,8 @@
#include "esirisc_jtag.h"
+static uint8_t esirisc_jtag_get_eid(struct esirisc_jtag *jtag_info);
+
static void esirisc_jtag_set_instr(struct esirisc_jtag *jtag_info, uint32_t new_instr)
{
struct jtag_tap *tap = jtag_info->tap;
@@ -221,7 +223,7 @@ bool esirisc_jtag_is_stopped(struct esirisc_jtag *jtag_info)
return !!(jtag_info->status & 1<<6); /* S */
}
-uint8_t esirisc_jtag_get_eid(struct esirisc_jtag *jtag_info)
+static uint8_t esirisc_jtag_get_eid(struct esirisc_jtag *jtag_info)
{
return jtag_info->status & 0x3f; /* EID */
}
@@ -490,7 +492,7 @@ int esirisc_jtag_enable_debug(struct esirisc_jtag *jtag_info)
return esirisc_jtag_send_ctrl(jtag_info, DEBUG_ENABLE_DEBUG);
}
-int esirisc_jtag_disable_debug(struct esirisc_jtag *jtag_info)
+static __attribute__((unused)) int esirisc_jtag_disable_debug(struct esirisc_jtag *jtag_info)
{
return esirisc_jtag_send_ctrl(jtag_info, DEBUG_DISABLE_DEBUG);
}
diff --git a/src/target/esirisc_jtag.h b/src/target/esirisc_jtag.h
index 98ec8af8d..d59b75fbe 100644
--- a/src/target/esirisc_jtag.h
+++ b/src/target/esirisc_jtag.h
@@ -54,7 +54,6 @@ struct esirisc_jtag {
bool esirisc_jtag_is_debug_active(struct esirisc_jtag *jtag_info);
bool esirisc_jtag_is_stopped(struct esirisc_jtag *jtag_info);
-uint8_t esirisc_jtag_get_eid(struct esirisc_jtag *jtag_info);
int esirisc_jtag_read_byte(struct esirisc_jtag *jtag_info,
uint32_t address, uint8_t *data);
@@ -81,7 +80,6 @@ int esirisc_jtag_write_csr(struct esirisc_jtag *jtag_info,
uint8_t bank, uint8_t csr, uint32_t data);
int esirisc_jtag_enable_debug(struct esirisc_jtag *jtag_info);
-int esirisc_jtag_disable_debug(struct esirisc_jtag *jtag_info);
int esirisc_jtag_assert_reset(struct esirisc_jtag *jtag_info);
int esirisc_jtag_deassert_reset(struct esirisc_jtag *jtag_info);
commit df42faf51d20d879beefacbd88b11271bcee181a
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:12:46 2024 +0100
target: aarch64: drop unused armv8_mmu_translate_va()
The function is not used.
Drop it!
Change-Id: I1625e03714b5a842f668098191c39cce34f815e8
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8549
Tested-by: jenkins
diff --git a/src/target/armv8.c b/src/target/armv8.c
index 61d72741a..88534d962 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1021,12 +1021,6 @@ static __attribute__((unused)) void armv8_show_fault_registers(struct target *ta
armv8_show_fault_registers32(armv8);
}
-/* method adapted to cortex A : reused arm v4 v5 method*/
-int armv8_mmu_translate_va(struct target *target, target_addr_t va, target_addr_t *val)
-{
- return ERROR_OK;
-}
-
static void armv8_decode_cacheability(int attr)
{
if (attr == 0) {
diff --git a/src/target/armv8.h b/src/target/armv8.h
index 349c8f002..49ab3e5cb 100644
--- a/src/target/armv8.h
+++ b/src/target/armv8.h
@@ -298,7 +298,6 @@ int armv8_identify_cache(struct armv8_common *armv8);
int armv8_init_arch_info(struct target *target, struct armv8_common *armv8);
int armv8_mmu_translate_va_pa(struct target *target, target_addr_t va,
target_addr_t *val, int meminfo);
-int armv8_mmu_translate_va(struct target *target, target_addr_t va, target_addr_t *val);
int armv8_handle_cache_info_command(struct command_invocation *cmd,
struct armv8_cache_common *armv8_cache);
-----------------------------------------------------------------------
Summary of changes:
src/target/armv8.c | 6 ------
src/target/armv8.h | 1 -
src/target/esirisc_jtag.c | 6 ++++--
src/target/esirisc_jtag.h | 2 --
4 files changed, 4 insertions(+), 11 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:48:13
|
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 c5babec7949d3fc23fd3fe43d5452897b7c94553 (commit)
from f3aeb3d67619510a2601e2a1055479b84a47fbf3 (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 c5babec7949d3fc23fd3fe43d5452897b7c94553
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:08:25 2024 +0100
target: x86_32: make x86_32_common_read_io() static
The function is not referenced outside the file.
Make it static.
Change-Id: Ic2552c040b6b46c0334851a4fc0fdaa400e11e4c
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8548
Tested-by: jenkins
diff --git a/src/target/x86_32_common.c b/src/target/x86_32_common.c
index 2c60b9f7e..8cca9a5e9 100644
--- a/src/target/x86_32_common.c
+++ b/src/target/x86_32_common.c
@@ -677,7 +677,7 @@ int x86_32_common_write_memory(struct target *t, target_addr_t addr,
return retval;
}
-int x86_32_common_read_io(struct target *t, uint32_t addr,
+static int x86_32_common_read_io(struct target *t, uint32_t addr,
uint32_t size, uint8_t *buf)
{
struct x86_32_common *x86_32 = target_to_x86_32(t);
diff --git a/src/target/x86_32_common.h b/src/target/x86_32_common.h
index 7392447a6..e23274769 100644
--- a/src/target/x86_32_common.h
+++ b/src/target/x86_32_common.h
@@ -309,8 +309,6 @@ int x86_32_common_read_memory(struct target *t, target_addr_t addr,
uint32_t size, uint32_t count, uint8_t *buf);
int x86_32_common_write_memory(struct target *t, target_addr_t addr,
uint32_t size, uint32_t count, const uint8_t *buf);
-int x86_32_common_read_io(struct target *t, uint32_t addr,
- uint32_t size, uint8_t *buf);
int x86_32_common_write_io(struct target *t, uint32_t addr,
uint32_t size, const uint8_t *buf);
int x86_32_common_add_breakpoint(struct target *t, struct breakpoint *bp);
-----------------------------------------------------------------------
Summary of changes:
src/target/x86_32_common.c | 2 +-
src/target/x86_32_common.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:47:49
|
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 f3aeb3d67619510a2601e2a1055479b84a47fbf3 (commit)
from a34d4b8cb41d99a55ae4dd4ee9f13478a34337a7 (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 f3aeb3d67619510a2601e2a1055479b84a47fbf3
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:06:29 2024 +0100
target: dsp563xx: make dsp563xx_once_reg_read_ex() static
The function is not referenced outside the file.
Make it static.
Change-Id: Ifeccc5e38f3da4b4111422860bc1c1447d00f7fe
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8547
Tested-by: jenkins
diff --git a/src/target/dsp563xx_once.c b/src/target/dsp563xx_once.c
index 866f33152..bb41ae8c7 100644
--- a/src/target/dsp563xx_once.c
+++ b/src/target/dsp563xx_once.c
@@ -34,6 +34,8 @@
#define JTAG_INSTR_DEBUG_REQUEST 0x07
#define JTAG_INSTR_BYPASS 0x0F
+static int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t *data);
+
/** */
static inline int dsp563xx_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti)
{
@@ -185,7 +187,7 @@ int dsp563xx_once_read_register(struct jtag_tap *tap, int flush, struct once_reg
}
/** once read register with register len */
-int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t *data)
+static int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t *data)
{
int err;
diff --git a/src/target/dsp563xx_once.h b/src/target/dsp563xx_once.h
index 871548837..4f27e1db7 100644
--- a/src/target/dsp563xx_once.h
+++ b/src/target/dsp563xx_once.h
@@ -65,8 +65,6 @@ int dsp563xx_once_target_status(struct jtag_tap *tap);
/** once read registers */
int dsp563xx_once_read_register(struct jtag_tap *tap, int flush, struct once_reg *regs, int len);
/** once read register */
-int dsp563xx_once_reg_read_ex(struct jtag_tap *tap, int flush, uint8_t reg, uint8_t len, uint32_t *data);
-/** once read register */
int dsp563xx_once_reg_read(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t *data);
/** once write register */
int dsp563xx_once_reg_write(struct jtag_tap *tap, int flush, uint8_t reg, uint32_t data);
-----------------------------------------------------------------------
Summary of changes:
src/target/dsp563xx_once.c | 4 +++-
src/target/dsp563xx_once.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:47:28
|
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 a34d4b8cb41d99a55ae4dd4ee9f13478a34337a7 (commit)
from 4da8f6d27a076a4a64c0d334cb647fdde08938a1 (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 a34d4b8cb41d99a55ae4dd4ee9f13478a34337a7
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 18:54:14 2024 +0100
pld: make get_pld_device_by_num() static
The function is not referenced outside the file.
Make it static.
Change-Id: I5f2a2c70085b9158df8806432bb9ed09bb256ab5
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8546
Tested-by: jenkins
diff --git a/src/pld/pld.c b/src/pld/pld.c
index 81fb0c463..edd779613 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -28,7 +28,7 @@ static struct pld_driver *pld_drivers[] = {
static struct pld_device *pld_devices;
-struct pld_device *get_pld_device_by_num(int num)
+static struct pld_device *get_pld_device_by_num(int num)
{
struct pld_device *p;
int i = 0;
diff --git a/src/pld/pld.h b/src/pld/pld.h
index 5e2fcd20c..a6e2e0fc8 100644
--- a/src/pld/pld.h
+++ b/src/pld/pld.h
@@ -54,7 +54,6 @@ struct pld_device {
int pld_register_commands(struct command_context *cmd_ctx);
-struct pld_device *get_pld_device_by_num(int num);
struct pld_device *get_pld_device_by_name(const char *name);
struct pld_device *get_pld_device_by_name_or_numstr(const char *str);
-----------------------------------------------------------------------
Summary of changes:
src/pld/pld.c | 2 +-
src/pld/pld.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:46:56
|
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 4da8f6d27a076a4a64c0d334cb647fdde08938a1 (commit)
from 644742b4b218eefd855dc636ccea25b769e80315 (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 4da8f6d27a076a4a64c0d334cb647fdde08938a1
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 18:51:52 2024 +0100
rtt: drop unused function rtt_started()
The function is not used.
Drop it!
Change-Id: I176c9d6ba077e36b762c14f9b877d5152992763c
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8545
Tested-by: jenkins
Reviewed-by: zapb <de...@za...>
diff --git a/src/rtt/rtt.c b/src/rtt/rtt.c
index e31e75410..42c3ee3ad 100644
--- a/src/rtt/rtt.c
+++ b/src/rtt/rtt.c
@@ -297,11 +297,6 @@ int rtt_write_channel(unsigned int channel_index, const uint8_t *buffer,
length, NULL);
}
-bool rtt_started(void)
-{
- return rtt.started;
-}
-
bool rtt_configured(void)
{
return rtt.configured;
diff --git a/src/rtt/rtt.h b/src/rtt/rtt.h
index a5630a951..49409074c 100644
--- a/src/rtt/rtt.h
+++ b/src/rtt/rtt.h
@@ -194,13 +194,6 @@ int rtt_get_polling_interval(unsigned int *interval);
*/
int rtt_set_polling_interval(unsigned int interval);
-/**
- * Get whether RTT is started.
- *
- * @returns Whether RTT is started.
- */
-bool rtt_started(void);
-
/**
* Get whether RTT is configured.
*
-----------------------------------------------------------------------
Summary of changes:
src/rtt/rtt.c | 5 -----
src/rtt/rtt.h | 7 -------
2 files changed, 12 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:46:33
|
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 644742b4b218eefd855dc636ccea25b769e80315 (commit)
via f4ac0c7022933adcbc68140ca565e93ece726ab5 (commit)
from f82664ff827ba76f773c51b74705c13b9c813758 (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 644742b4b218eefd855dc636ccea25b769e80315
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:33:58 2024 +0100
driver: mpsse: make local functions static
The functions:
- mpsse_divide_by_5_config();
- mpsse_purge();
- mpsse_rtck_config();
- mpsse_set_divisor();
are not referenced outside the file.
Make them static.
Change-Id: Id6930183a3ce26693b2113f622046168ba289df8
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8544
Tested-by: jenkins
diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c
index 1ef9550a0..38393ad0a 100644
--- a/src/jtag/drivers/mpsse.c
+++ b/src/jtag/drivers/mpsse.c
@@ -75,6 +75,8 @@ struct mpsse_ctx {
int retval;
};
+static void mpsse_purge(struct mpsse_ctx *ctx);
+
/* Returns true if the string descriptor indexed by str_index in device matches string */
static bool string_descriptor_equal(struct libusb_device_handle *device, uint8_t str_index,
const char *string)
@@ -421,7 +423,7 @@ bool mpsse_is_high_speed(struct mpsse_ctx *ctx)
return ctx->type != TYPE_FT2232C;
}
-void mpsse_purge(struct mpsse_ctx *ctx)
+static void mpsse_purge(struct mpsse_ctx *ctx)
{
int err;
LOG_DEBUG("-");
@@ -709,7 +711,7 @@ void mpsse_loopback_config(struct mpsse_ctx *ctx, bool enable)
single_byte_boolean_helper(ctx, enable, 0x84, 0x85);
}
-void mpsse_set_divisor(struct mpsse_ctx *ctx, uint16_t divisor)
+static void mpsse_set_divisor(struct mpsse_ctx *ctx, uint16_t divisor)
{
LOG_DEBUG("%d", divisor);
@@ -726,7 +728,7 @@ void mpsse_set_divisor(struct mpsse_ctx *ctx, uint16_t divisor)
buffer_write_byte(ctx, divisor >> 8);
}
-int mpsse_divide_by_5_config(struct mpsse_ctx *ctx, bool enable)
+static int mpsse_divide_by_5_config(struct mpsse_ctx *ctx, bool enable)
{
if (!mpsse_is_high_speed(ctx))
return ERROR_FAIL;
@@ -737,7 +739,7 @@ int mpsse_divide_by_5_config(struct mpsse_ctx *ctx, bool enable)
return ERROR_OK;
}
-int mpsse_rtck_config(struct mpsse_ctx *ctx, bool enable)
+static int mpsse_rtck_config(struct mpsse_ctx *ctx, bool enable)
{
if (!mpsse_is_high_speed(ctx))
return ERROR_FAIL;
diff --git a/src/jtag/drivers/mpsse.h b/src/jtag/drivers/mpsse.h
index 4a625d890..e95f842c9 100644
--- a/src/jtag/drivers/mpsse.h
+++ b/src/jtag/drivers/mpsse.h
@@ -59,9 +59,6 @@ void mpsse_set_data_bits_high_byte(struct mpsse_ctx *ctx, uint8_t data, uint8_t
void mpsse_read_data_bits_low_byte(struct mpsse_ctx *ctx, uint8_t *data);
void mpsse_read_data_bits_high_byte(struct mpsse_ctx *ctx, uint8_t *data);
void mpsse_loopback_config(struct mpsse_ctx *ctx, bool enable);
-void mpsse_set_divisor(struct mpsse_ctx *ctx, uint16_t divisor);
-int mpsse_divide_by_5_config(struct mpsse_ctx *ctx, bool enable);
-int mpsse_rtck_config(struct mpsse_ctx *ctx, bool enable);
/* Helper to set frequency in Hertz. Returns actual realizable frequency or negative error.
* Frequency 0 means RTCK. */
@@ -69,6 +66,5 @@ int mpsse_set_frequency(struct mpsse_ctx *ctx, int frequency);
/* Queue handling */
int mpsse_flush(struct mpsse_ctx *ctx);
-void mpsse_purge(struct mpsse_ctx *ctx);
#endif /* OPENOCD_JTAG_DRIVERS_MPSSE_H */
commit f4ac0c7022933adcbc68140ca565e93ece726ab5
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:39:11 2024 +0100
jtag: driver: make local functions static
The functions:
- interface_jtag_add_callback();
- interface_jtag_add_callback4();
are not referenced outside the file.
Make them static.
Change-Id: I84f738309d23c8d0b5329aa04436db750cf185e5
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8543
Tested-by: jenkins
diff --git a/src/jtag/drivers/driver.c b/src/jtag/drivers/driver.c
index d52a345a0..58e59a559 100644
--- a/src/jtag/drivers/driver.c
+++ b/src/jtag/drivers/driver.c
@@ -341,7 +341,7 @@ int interface_jtag_add_sleep(uint32_t us)
}
/* add callback to end of queue */
-void interface_jtag_add_callback4(jtag_callback_t callback,
+static void interface_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)
{
@@ -395,7 +395,7 @@ static int jtag_convert_to_callback4(jtag_callback_data_t data0,
return ERROR_OK;
}
-void interface_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0)
+static void interface_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0)
{
jtag_add_callback4(jtag_convert_to_callback4, data0, (jtag_callback_data_t)callback, 0, 0);
}
diff --git a/src/jtag/drivers/minidriver_imp.h b/src/jtag/drivers/minidriver_imp.h
index b29b3c9cc..f3582f6e3 100644
--- a/src/jtag/drivers/minidriver_imp.h
+++ b/src/jtag/drivers/minidriver_imp.h
@@ -17,12 +17,6 @@ static inline void interface_jtag_add_scan_check_alloc(struct scan_field *field)
field->in_value = cmd_queue_alloc(num_bytes);
}
-void interface_jtag_add_callback(jtag_callback1_t f, jtag_callback_data_t data0);
-
-void interface_jtag_add_callback4(jtag_callback_t f, jtag_callback_data_t data0,
- jtag_callback_data_t data1, jtag_callback_data_t data2,
- jtag_callback_data_t data3);
-
void jtag_add_callback4(jtag_callback_t f, jtag_callback_data_t data0,
jtag_callback_data_t data1, jtag_callback_data_t data2,
jtag_callback_data_t data3);
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/driver.c | 4 ++--
src/jtag/drivers/minidriver_imp.h | 6 ------
src/jtag/drivers/mpsse.c | 10 ++++++----
src/jtag/drivers/mpsse.h | 4 ----
4 files changed, 8 insertions(+), 16 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:46:17
|
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 f82664ff827ba76f773c51b74705c13b9c813758 (commit)
from 2465f1851549e16337e0eef84e581b62d541a187 (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 f82664ff827ba76f773c51b74705c13b9c813758
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 19:29:43 2024 +0100
jtag: core: make local functions static
The functions:
- jtag_error_clear();
- jtag_tap_count();
are not referenced outside the file.
Make them static.
Change-Id: I00fcf06b1838b9f6c955c19772f1d41d486459e9
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8542
Tested-by: jenkins
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 907883f09..769e07571 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -51,6 +51,8 @@ static void jtag_add_scan_check(struct jtag_tap *active,
tap_state_t state),
int in_num_fields, struct scan_field *in_fields, tap_state_t state);
+static int jtag_error_clear(void);
+
/**
* The jtag_error variable is set when an error occurs while executing
* the queue. Application code may set this using jtag_set_error(),
@@ -127,7 +129,11 @@ void jtag_set_error(int error)
jtag_error = error;
}
-int jtag_error_clear(void)
+/**
+ * Resets jtag_error to ERROR_OK, returning its previous value.
+ * @returns The previous value of @c jtag_error.
+ */
+static int jtag_error_clear(void)
{
int temp = jtag_error;
jtag_error = ERROR_OK;
@@ -186,7 +192,7 @@ struct jtag_tap *jtag_all_taps(void)
return __jtag_all_taps;
};
-unsigned int jtag_tap_count(void)
+static unsigned int jtag_tap_count(void)
{
struct jtag_tap *t = jtag_all_taps();
unsigned int n = 0;
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index b9d37b32a..86526a09a 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -153,7 +153,6 @@ struct jtag_tap *jtag_tap_by_jim_obj(Jim_Interp *interp, Jim_Obj *obj);
struct jtag_tap *jtag_tap_by_position(unsigned int abs_position);
struct jtag_tap *jtag_tap_next_enabled(struct jtag_tap *p);
unsigned int jtag_tap_count_enabled(void);
-unsigned int jtag_tap_count(void);
/*
* - TRST_ASSERTED triggers two sets of callbacks, after operations to
@@ -568,11 +567,6 @@ void jtag_sleep(uint32_t us);
* called with a non-zero error code.
*/
void jtag_set_error(int error);
-/**
- * Resets jtag_error to ERROR_OK, returning its previous value.
- * @returns The previous value of @c jtag_error.
- */
-int jtag_error_clear(void);
/**
* Return true if it's safe for a background polling task to access the
-----------------------------------------------------------------------
Summary of changes:
src/jtag/core.c | 10 ++++++++--
src/jtag/jtag.h | 6 ------
2 files changed, 8 insertions(+), 8 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:46:01
|
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 2465f1851549e16337e0eef84e581b62d541a187 (commit)
from 989e9e8b5488be6dbf4ed2e9f5cbda208b841860 (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 2465f1851549e16337e0eef84e581b62d541a187
Author: Antonio Borneo <bor...@gm...>
Date: Sat Nov 9 18:49:11 2024 +0100
adapter: make adapter_config_khz() static
The function is not referenced outside the file.
Make it static.
Change-Id: I72e96624749ae4cc7f4566d737a88186e899616a
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8541
Tested-by: jenkins
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 996a23f1f..04942f753 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -66,6 +66,8 @@ static const struct gpio_map {
[ADAPTER_GPIO_IDX_LED] = { "led", ADAPTER_GPIO_DIRECTION_OUTPUT, true, true, },
};
+static int adapter_config_khz(unsigned int khz);
+
bool is_adapter_initialized(void)
{
return adapter_config.adapter_initialized;
@@ -245,7 +247,8 @@ static int adapter_set_speed(int speed)
return is_adapter_initialized() ? adapter_driver->speed(speed) : ERROR_OK;
}
-int adapter_config_khz(unsigned int khz)
+/** Attempt to configure the adapter for the specified kHz. */
+static int adapter_config_khz(unsigned int khz)
{
LOG_DEBUG("handle adapter khz");
adapter_config.clock_mode = CLOCK_MODE_KHZ;
diff --git a/src/jtag/adapter.h b/src/jtag/adapter.h
index 23ffe2cc5..556952f8d 100644
--- a/src/jtag/adapter.h
+++ b/src/jtag/adapter.h
@@ -97,9 +97,6 @@ int adapter_get_speed(int *speed);
*/
int adapter_get_speed_readable(int *speed);
-/** Attempt to configure the adapter for the specified kHz. */
-int adapter_config_khz(unsigned int khz);
-
/**
* Attempt to enable RTCK/RCLK. If that fails, fallback to the
* specified frequency.
-----------------------------------------------------------------------
Summary of changes:
src/jtag/adapter.c | 5 ++++-
src/jtag/adapter.h | 3 ---
2 files changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-23 13:41:36
|
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 989e9e8b5488be6dbf4ed2e9f5cbda208b841860 (commit)
from 8a3723022689dd078c3e61268615616d5566fc94 (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 989e9e8b5488be6dbf4ed2e9f5cbda208b841860
Author: Antonio Borneo <bor...@gm...>
Date: Fri Oct 11 10:10:12 2024 +0200
gitignore: drop ignoring files not generated anymore
With the drop of the code for the probe zy1000 [1] and then the
drop of minidriver code [2], there are no more auto-generated
source files.
Remove them from the list of generated files to be ignored.
Change-Id: Iee65e21528674ea4cc94018e52126f882da4f07c
Signed-off-by: Antonio Borneo <bor...@gm...>
[1] b0fe92dba7c0 ("zy1000: drop the code, deprecated in v0.10.0")
[2] 25218e893503 ("jtag: remove minidriver code and minidriver-dummy")
Reviewed-on: https://review.openocd.org/c/openocd/+/8522
Tested-by: jenkins
diff --git a/.gitignore b/.gitignore
index 1b4e08ba3..f0746c195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,10 +11,6 @@
*.la
*.in
-# generated source files
-src/jtag/minidriver_imp.h
-src/jtag/jtag_minidriver.h
-
# coverage files (gcov)
*.gcda
*.gcno
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 ----
1 file changed, 4 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-16 14:26: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 8a3723022689dd078c3e61268615616d5566fc94 (commit)
from 6d60ac5c08e6343008f40ee3d8daa5e8e00eb148 (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 8a3723022689dd078c3e61268615616d5566fc94
Author: Antonio Borneo <bor...@gm...>
Date: Mon Apr 10 12:02:55 2023 +0200
checkpatch: exclude gerrit's Change-Id line from commit description
Checkpatch rejects patches that have empty commit description and
logs them with:
WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
But if the patch has a gerrit's Change-Id line placed before the
line Signed-off-by, then checkpatch considers the Change-Id line
as a valid commit description text.
Use the Change-Id tag as a marker of the end of the commit message,
thus not counting its line as part of the commit description.
This patch is not relevant for the Linux kernel development process
as gerrit is not involved and the Change-Id tag is rejected. But
other projects, like OpenOCD, base the development on gerrit and
reuse kernel's checkpatch with flag '--ignore GERRIT_CHANGE_ID'.
This patch has been refused [1] in Linux upstream because it has
not been considered relevant for that project.
Let's take it as another add-on in OpenOCD checkpatch.
Change-Id: I3b55b8fffa07ce67177c108e7c9554ca46674246
Signed-off-by: Antonio Borneo <bor...@gm...>
Link: [1] https://lore.kernel.org/lkml/202...@gm.../
Reviewed-on: https://review.openocd.org/c/openocd/+/8539
Tested-by: jenkins
diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index 01bd547ff..1011b3305 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -3251,6 +3251,9 @@ sub process {
# Check for Gerrit Change-Ids not in any patch context
if ($realfile eq '' && !$has_patch_separator && $line =~ /^\s*change-id:/i) {
+ # OpenOCD specific: Begin: exclude gerrit's Change-Id line from commit description
+ $in_commit_log = 0;
+ # OpenOCD specific: End
if (ERROR("GERRIT_CHANGE_ID",
"Remove Gerrit Change-Id's before submitting upstream\n" . $herecurr) &&
$fix) {
-----------------------------------------------------------------------
Summary of changes:
tools/scripts/checkpatch.pl | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-16 14:21:29
|
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 6d60ac5c08e6343008f40ee3d8daa5e8e00eb148 (commit)
from 564b24e7f899f401ec6e5adda7906244f60c0135 (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 6d60ac5c08e6343008f40ee3d8daa5e8e00eb148
Author: R. Diez <rdi...@ya...>
Date: Fri Nov 1 09:46:05 2024 +0100
Make bootstrap more robust
Change-Id: I67cc22752b34dd49c277e247f0b648047927a02b
Signed-off-by: R. Diez <rdi...@ya...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8532
Reviewed-by: R. Diez <rdi...@rd...>
Tested-by: jenkins
Reviewed-by: zapb <de...@za...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/bootstrap b/bootstrap
index 7d4ca37bd..9dfdc41ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,8 +3,8 @@
# Run the autotools bootstrap sequence to create the configure script
-# Abort execution on error
-set -e
+set -e # Abort execution on error.
+set -u # Abort if you reference an undefined variable.
if which libtoolize > /dev/null; then
libtoolize="libtoolize"
@@ -15,13 +15,21 @@ else
exit 1
fi
-if [ "$1" = "nosubmodule" ]; then
- SKIP_SUBMODULE=1
-elif [ -n "$1" ]; then
- echo "$0: Illegal argument $1"
- echo "USAGE: $0 [nosubmodule]"
- exit 1
-fi
+SKIP_SUBMODULE=0
+
+case "$#" in
+ 0) ;;
+ 1) if [ "$1" = "nosubmodule" ]; then
+ SKIP_SUBMODULE=1
+ else
+ echo "$0: Illegal argument $1" >&2
+ echo "USAGE: $0 [nosubmodule]" >&2
+ exit 1
+ fi;;
+ *) echo "$0: Wrong number of command-line arguments." >&2
+ echo "USAGE: $0 [nosubmodule]" >&2
+ exit 1;;
+esac
# bootstrap the autotools
(
@@ -34,7 +42,7 @@ autoheader --warnings=all
automake --warnings=all --gnu --add-missing --copy
)
-if [ -n "$SKIP_SUBMODULE" ]; then
+if [ "$SKIP_SUBMODULE" -ne 0 ]; then
echo "Skipping submodule setup"
else
echo "Setting up submodules"
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-16 14:20:47
|
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 564b24e7f899f401ec6e5adda7906244f60c0135 (commit)
from d4a64e3f38a9ad7a27554547c2720f17ed3580a3 (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 564b24e7f899f401ec6e5adda7906244f60c0135
Author: R. Diez <rdi...@ya...>
Date: Fri Nov 1 20:21:56 2024 +0100
Makefile.am: generate ChangeLog with git log instead of git2cl
git log is faster than git2cl and the result has a better format.
Change-Id: I465ca62e3e30fed230fe9661e82a987980c05459
Signed-off-by: R. Diez <rdi...@ya...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8531
Tested-by: jenkins
Reviewed-by: R. Diez <rdi...@rd...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/.gitmodules b/.gitmodules
index f2da17ed7..abb773538 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "tools/git2cl"]
- path = tools/git2cl
- url = https://git.savannah.nongnu.org/git/git2cl.git
[submodule "jimtcl"]
path = jimtcl
url = https://github.com/msteveb/jimtcl.git
diff --git a/Makefile.am b/Makefile.am
index ab0a2373d..155a2b3bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -123,14 +123,13 @@ TCL_PATH = tcl
TCL_FILES = find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' -o -name '*.txt' | \
sed -e 's,^$(srcdir)/$(TCL_PATH),,'
-# Without the PERL_UNICODE="IO" workaround below when running git2cl, you get several
-# "Wide character" warnings and you also risk an invalid character encoding in
-# the generated ChangeLog file. For more information, see this bug report:
-# Warning "Wide character in print"
-# https://savannah.nongnu.org/bugs/?65689
+# The git log command below generates many empty text lines with only some space characters
+# for indentation purposes, so use sed to trim all trailing whitespace.
dist-hook:
if test -d $(srcdir)/.git -a \( ! -e $(distdir)/ChangeLog -o -w $(distdir)/ChangeLog \) ; then \
- git --git-dir $(srcdir)/.git log | PERL_UNICODE="IO" $(srcdir)/tools/git2cl/git2cl > $(distdir)/ChangeLog ; \
+ git --git-dir $(srcdir)/.git log --date=short --pretty="format:%ad %aN <%aE>%n%n%w(0,4,6)* %B" \
+ | sed 's/[[:space:]]*$$//' > $(distdir)/ChangeLog.tmp && \
+ mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; \
fi
for i in $$($(TCL_FILES)); do \
j="$(distdir)/$(TCL_PATH)/$$i" && \
diff --git a/tools/git2cl b/tools/git2cl
deleted file mode 160000
index 8373c9f74..000000000
--- a/tools/git2cl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8373c9f74993e218a08819cbcdbab3f3564bbeba
-----------------------------------------------------------------------
Summary of changes:
.gitmodules | 3 ---
Makefile.am | 11 +++++------
tools/git2cl | 1 -
3 files changed, 5 insertions(+), 10 deletions(-)
delete mode 160000 tools/git2cl
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-16 14:19:29
|
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 d4a64e3f38a9ad7a27554547c2720f17ed3580a3 (commit)
from fd62626dff25cf503a25040d3040b0a2bb9b2a76 (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 d4a64e3f38a9ad7a27554547c2720f17ed3580a3
Author: Jan Matyas <jan...@co...>
Date: Thu Oct 10 20:35:19 2024 +0200
autoconf: Add support for code coverage
Add support for code coverage collection. This helps
developers to check if their test scenarios really exercised
all the OpenOCD functionality that they intended to test.
- Option --enable-gcov has been added to configure.ac
which enables the coverage collection using Gcov. (Disabled
by default.)
- The steps to collect and inspect the coverage have been
described in HACKING file.
Change-Id: I259e401937a255e7ad7f155359a0b7787e4d0752
Signed-off-by: Jan Matyas <jan...@co...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8521
Tested-by: jenkins
Reviewed-by: Evgeniy Naydanov <evg...@sy...>
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/.gitignore b/.gitignore
index 5de33077e..1b4e08ba3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,10 @@
src/jtag/minidriver_imp.h
src/jtag/jtag_minidriver.h
+# coverage files (gcov)
+*.gcda
+*.gcno
+
# OpenULINK driver files generated by SDCC
src/jtag/drivers/OpenULINK/*.rel
src/jtag/drivers/OpenULINK/*.asm
diff --git a/HACKING b/HACKING
index 9e8cd357f..8988b1617 100644
--- a/HACKING
+++ b/HACKING
@@ -92,6 +92,22 @@ patch:
make
@endcode
+- Code coverage analysis
+
+ By inspecting the code coverage, you can identify potential gaps in your testing
+ and use that information to improve your test scenarios.
+
+ Example usage:
+ @code
+ mkdir build-gcov; cd build-gcov
+ ../configure --enable-gcov [...]
+ make
+ # ... Now execute your test scenarios to collect OpenOCD code coverage ...
+ lcov --capture --directory ./src --output-file openocd-coverage.info
+ genhtml openocd-coverage.info --output-directory coverage_report
+ # ... Open coverage_report/index.html in a web browser ...
+ @endcode
+
Please consider performing these additional checks where appropriate
(especially Clang Static Analyzer for big portions of new code) and
mention the results (e.g. "Valgrind-clean, no new Clang analyzer
diff --git a/Makefile.am b/Makefile.am
index 2230e628f..ab0a2373d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ endif
# common flags used in openocd build
AM_CFLAGS = $(GCC_WARNINGS)
+AM_LDFLAGS =
AM_CPPFLAGS = $(HOST_CPPFLAGS)\
-I$(top_srcdir)/src \
@@ -51,6 +52,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
else
AM_CPPFLAGS += $(JIMTCL_CFLAGS)
endif
+
+if USE_GCOV
+AM_CFLAGS += --coverage
+AM_LDFLAGS += --coverage
+endif
+
EXTRA_DIST += \
BUGS \
HACKING \
diff --git a/configure.ac b/configure.ac
index 9355ffb93..291e854a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,6 +171,9 @@ m4_define([DUMMY_ADAPTER],
m4_define([OPTIONAL_LIBRARIES],
[[[capstone], [Use Capstone disassembly framework], []]])
+m4_define([COVERAGE],
+ [[[gcov], [Collect coverage using gcov], []]])
+
AC_ARG_ENABLE([doxygen-html],
AS_HELP_STRING([--disable-doxygen-html],
[Disable building Doxygen manual as HTML.]),
@@ -199,6 +202,19 @@ AC_ARG_ENABLE([werror],
AS_HELP_STRING([--disable-werror], [Do not treat warnings as errors]),
[gcc_werror=$enableval], [gcc_werror=$gcc_warnings])
+AC_ARG_ENABLE([gcov],
+ AS_HELP_STRING([--enable-gcov], [Enable runtime coverage collection via gcov]),
+ [enable_gcov=$enableval], [enable_gcov=no])
+
+AS_IF([test "x$enable_gcov" = "xyes"], [
+ AC_DEFINE([USE_GCOV], [1], [1 to enable coverage collection using gcov.])
+ dnl When collecting coverage, disable optimizations.
+ dnl This overrides the "-O2" that autoconf uses by default:
+ CFLAGS+=" -O0"
+], [
+ AC_DEFINE([USE_GCOV], [0], [0 to leave coverage collection disabled.])
+])
+
# set default verbose options, overridden by following options
debug_usb_io=no
debug_usb_comms=no
@@ -787,6 +803,8 @@ AM_CONDITIONAL([INTERNAL_JIMTCL], [test "x$use_internal_jimtcl" = "xyes"])
AM_CONDITIONAL([HAVE_JIMTCL_PKG_CONFIG], [test "x$have_jimtcl_pkg_config" = "xyes"])
AM_CONDITIONAL([INTERNAL_LIBJAYLINK], [test "x$use_internal_libjaylink" = "xyes"])
+AM_CONDITIONAL([USE_GCOV], [test "x$enable_gcov" = "xyes"])
+
# Look for environ alternatives. Possibility #1: is environ in unistd.h or stdlib.h?
AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -862,7 +880,8 @@ m4_foreach([adapter], [USB1_ADAPTERS,
LIBGPIOD_ADAPTERS,
LIBJAYLINK_ADAPTERS, PCIE_ADAPTERS, SERIAL_PORT_ADAPTERS,
DUMMY_ADAPTER,
- OPTIONAL_LIBRARIES],
+ OPTIONAL_LIBRARIES,
+ COVERAGE],
[s=m4_format(["%-40s"], ADAPTER_DESC([adapter]))
AS_CASE([$ADAPTER_VAR([adapter])],
[auto], [
diff --git a/src/openocd.c b/src/openocd.c
index 7a5147050..9fd709e32 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -375,6 +375,13 @@ int openocd_main(int argc, char *argv[])
log_exit();
+#if USE_GCOV
+ /* Always explicitly dump coverage data before terminating.
+ * Otherwise coverage would not be dumped when exit_on_signal occurs. */
+ void __gcov_dump(void);
+ __gcov_dump();
+#endif
+
if (ret == ERROR_FAIL)
return EXIT_FAILURE;
else if (ret != ERROR_OK)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 ++++
HACKING | 16 ++++++++++++++++
Makefile.am | 7 +++++++
configure.ac | 21 ++++++++++++++++++++-
src/openocd.c | 7 +++++++
5 files changed, 54 insertions(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-11 17:34:29
|
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 fd62626dff25cf503a25040d3040b0a2bb9b2a76 (commit)
from b68d23da3c3bc67cffc750fddd64a6be9c615fdb (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 fd62626dff25cf503a25040d3040b0a2bb9b2a76
Author: Evgeniy Naydanov <evg...@sy...>
Date: Mon Sep 16 18:01:17 2024 +0300
target/breakpoints: fix types in `watchpoint_add_internal()`
There was a conflict:
1. commit 2cd8ebf44d1a ("breakpoints: use 64-bit type for watchpoint mask
and value")
2. commit 0bf3373e808a ("target/breakpoints: Use 'unsigned int' for
length")
The second commit was created erlier, but merged later so the types of
`mask` and `value` became `uint32_t` in `watchpoint_add_internal()`.
This created a bug:
`WATCHPOINT_IGNORE_DATA_VALUE_MASK` is defined as `(~(uint64_t)0)`.
Truncation to uint32_t makes it so the comparisons with the constant
don't work.
Change-Id: I19c414c351f52aff72a60330d83c29db7bbca375
Signed-off-by: Evgeniy Naydanov <evg...@sy...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8500
Reviewed-by: Antonio Borneo <bor...@gm...>
Reviewed-by: Jan Matyas <jan...@co...>
Tested-by: jenkins
Reviewed-by: zapb <de...@za...>
Reviewed-by: Karl Palsson <ka...@tw...>
diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c
index 2fbb69e07..9378abcb1 100644
--- a/src/target/breakpoints.c
+++ b/src/target/breakpoints.c
@@ -500,7 +500,7 @@ struct breakpoint *breakpoint_find(struct target *target, target_addr_t address)
}
static int watchpoint_add_internal(struct target *target, target_addr_t address,
- unsigned int length, enum watchpoint_rw rw, uint32_t value, uint32_t mask)
+ unsigned int length, enum watchpoint_rw rw, uint64_t value, uint64_t mask)
{
struct watchpoint *watchpoint = target->watchpoints;
struct watchpoint **watchpoint_p = &target->watchpoints;
-----------------------------------------------------------------------
Summary of changes:
src/target/breakpoints.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-09 21:06:47
|
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 b68d23da3c3bc67cffc750fddd64a6be9c615fdb (commit)
from bcebc84882116c5c08c9243297a925262b1c3f0f (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 b68d23da3c3bc67cffc750fddd64a6be9c615fdb
Author: Marek Kraus <gam...@ou...>
Date: Wed Oct 23 16:27:33 2024 +0200
tcl/target/bl702: implement full software reset
In previous implementation, it was known that it does not perform
full reset, and that some peripherals, such as GLB core,
which handles among other stuff GPIOs, was not reset.
It was presumed, that full reset by software is not possible,
although, by accident, even when comment says that
CTRL_PWRON_RESET is set to 1, it is not
(value written into 0x40000018 supposed to be 0x7, not 0x6).
CTRL_PWRON_RESET indeed triggers full "power-on like" reset,
so this method is implemented in this commit.
There are some workarounds to make reset seamless, without any
error messages, which are described in comments of TCL script.
Only down-side of this reset is, that chip is halted after reset
bit later in BootROM than previous implementation,
but it's still good.
Change-Id: Ife2cdcc6a2d96a2e24039bfec149705baf046318
Signed-off-by: Marek Kraus <gam...@ou...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8529
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/tcl/target/bl702.cfg b/tcl/target/bl702.cfg
index 6d4a048d9..5046cd189 100644
--- a/tcl/target/bl702.cfg
+++ b/tcl/target/bl702.cfg
@@ -34,6 +34,10 @@ $_TARGETNAME configure -work-area-phys 0x22020000 -work-area-size 0x10000 -work-
# Internal RC ticks on 32 MHz, so this speed should be safe to use.
adapter speed 4000
+# Debug Module's ndmreset resets only Trust Zone Controller, so we need to do SW reset instead.
+# CTRL_PWRON_RESET triggers full "power-on like" reset.
+# This means that pinmux configuration to access JTAG is reset as well, and configured back early
+# in BootROM.
$_TARGETNAME configure -event reset-assert-pre {
halt
@@ -55,6 +59,15 @@ $_TARGETNAME configure -event reset-assert-pre {
# Do reset
# In GLB_SWRST_CFG2, clear CTRL_SYS_RESET, CTRL_CPU_RESET and CTRL_PWRON_RESET
mmw 0x40000018 0x0 0x00000007
+
+ # Since this full software reset resets GPIO pinmux as well, we will lose access
+ # to JTAG right away after writing to register. This chip doesn't support abstract
+ # memory access, so when this is done by progbuf or sysbus, OpenOCD will fail to read
+ # if write was successful or not, and will print error about that. Since receiving of
+ # this error is expected, we will turn off log printing for a moment,
+ set lvl [lindex [debug_level] 1]
+ debug_level -1
# In GLB_SWRST_CFG2, set CTRL_SYS_RESET, CTRL_CPU_RESET and CTRL_PWRON_RESET to 1
- mmw 0x40000018 0x6 0x0
+ catch {mmw 0x40000018 0x7 0x0}
+ debug_level $lvl
}
-----------------------------------------------------------------------
Summary of changes:
tcl/target/bl702.cfg | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-09 21:05:55
|
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 bcebc84882116c5c08c9243297a925262b1c3f0f (commit)
from 40d58ce5290a51c58615c4f95912b69fa7975aea (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 bcebc84882116c5c08c9243297a925262b1c3f0f
Author: Mark Zhuang <mar...@sp...>
Date: Sat Oct 26 10:30:18 2024 +0800
contrib: convert 'unsigned' to 'unsigned int'
Conversion done with
checkpatch --fix-inplace -types UNSPECIFIED_INT
Change-Id: I0e31f87d437fcf3503736474f10a63f9c6be242b
Signed-off-by: Mark Zhuang <mar...@sp...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8368
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/contrib/itmdump.c b/contrib/itmdump.c
index e7523d9bc..7c93a3963 100644
--- a/contrib/itmdump.c
+++ b/contrib/itmdump.c
@@ -43,9 +43,9 @@ unsigned int dump_swit;
* NOTE that this specific encoding could be space-optimized; and that
* trace data streams could also be history-sensitive.
*/
-static void show_task(int port, unsigned data)
+static void show_task(int port, unsigned int data)
{
- unsigned code = data >> 16;
+ unsigned int code = data >> 16;
char buf[16];
if (dump_swit)
@@ -77,7 +77,7 @@ static void show_task(int port, unsigned data)
static void show_reserved(FILE *f, char *label, int c)
{
- unsigned i;
+ unsigned int i;
if (dump_swit)
return;
@@ -96,9 +96,9 @@ static void show_reserved(FILE *f, char *label, int c)
printf("\n");
}
-static bool read_varlen(FILE *f, int c, unsigned *value)
+static bool read_varlen(FILE *f, int c, unsigned int *value)
{
- unsigned size;
+ unsigned int size;
unsigned char buf[4];
*value = 0;
@@ -135,8 +135,8 @@ err:
static void show_hard(FILE *f, int c)
{
- unsigned type = c >> 3;
- unsigned value;
+ unsigned int type = c >> 3;
+ unsigned int value;
char *label;
if (dump_swit)
@@ -230,16 +230,16 @@ static void show_hard(FILE *f, int c)
*/
struct {
int port;
- void (*show)(int port, unsigned data);
+ void (*show)(int port, unsigned int data);
} format[] = {
{ .port = 31, .show = show_task, },
};
static void show_swit(FILE *f, int c)
{
- unsigned port = c >> 3;
- unsigned value = 0;
- unsigned i;
+ unsigned int port = c >> 3;
+ unsigned int value = 0;
+ unsigned int i;
if (port + 1 == dump_swit) {
if (!read_varlen(f, c, &value))
@@ -272,7 +272,7 @@ static void show_swit(FILE *f, int c)
static void show_timestamp(FILE *f, int c)
{
- unsigned counter = 0;
+ unsigned int counter = 0;
char *label = "";
bool delayed = false;
diff --git a/contrib/loaders/flash/fespi/riscv_fespi.c b/contrib/loaders/flash/fespi/riscv_fespi.c
index 17ae2fd22..08fb09477 100644
--- a/contrib/loaders/flash/fespi/riscv_fespi.c
+++ b/contrib/loaders/flash/fespi/riscv_fespi.c
@@ -103,7 +103,7 @@ static void fespi_disable_hw_mode(volatile uint32_t *ctrl_base);
static void fespi_enable_hw_mode(volatile uint32_t *ctrl_base);
static int fespi_wip(volatile uint32_t *ctrl_base);
static int fespi_write_buffer(volatile uint32_t *ctrl_base,
- const uint8_t *buffer, unsigned offset, unsigned len,
+ const uint8_t *buffer, unsigned int offset, unsigned int len,
uint32_t flash_info);
/* Can set bits 3:0 in result. */
@@ -113,7 +113,7 @@ static int fespi_write_buffer(volatile uint32_t *ctrl_base,
* after pprog_cmd
*/
int flash_fespi(volatile uint32_t *ctrl_base, uint32_t page_size,
- const uint8_t *buffer, unsigned offset, uint32_t count,
+ const uint8_t *buffer, unsigned int offset, uint32_t count,
uint32_t flash_info)
{
int result;
@@ -163,12 +163,12 @@ err:
return result;
}
-static uint32_t fespi_read_reg(volatile uint32_t *ctrl_base, unsigned address)
+static uint32_t fespi_read_reg(volatile uint32_t *ctrl_base, unsigned int address)
{
return ctrl_base[address / 4];
}
-static void fespi_write_reg(volatile uint32_t *ctrl_base, unsigned address, uint32_t value)
+static void fespi_write_reg(volatile uint32_t *ctrl_base, unsigned int address, uint32_t value)
{
ctrl_base[address / 4] = value;
}
@@ -188,7 +188,7 @@ static void fespi_enable_hw_mode(volatile uint32_t *ctrl_base)
/* Can set bits 7:4 in result. */
static int fespi_txwm_wait(volatile uint32_t *ctrl_base)
{
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
uint32_t ip = fespi_read_reg(ctrl_base, FESPI_REG_IP);
@@ -209,7 +209,7 @@ static void fespi_set_dir(volatile uint32_t *ctrl_base, bool dir)
/* Can set bits 11:8 in result. */
static int fespi_tx(volatile uint32_t *ctrl_base, uint8_t in)
{
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
uint32_t txfifo = fespi_read_reg(ctrl_base, FESPI_REG_TXFIFO);
@@ -224,7 +224,7 @@ static int fespi_tx(volatile uint32_t *ctrl_base, uint8_t in)
/* Can set bits 15:12 in result. */
static int fespi_rx(volatile uint32_t *ctrl_base, uint8_t *out)
{
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
uint32_t value = fespi_read_reg(ctrl_base, FESPI_REG_RXFIFO);
@@ -252,7 +252,7 @@ static int fespi_wip(volatile uint32_t *ctrl_base)
if (result != ERROR_OK)
return result | ERROR_STACK(0x20000);
- unsigned timeout = TIMEOUT;
+ unsigned int timeout = TIMEOUT;
while (timeout--) {
result = fespi_tx(ctrl_base, 0);
if (result != ERROR_OK)
@@ -273,7 +273,7 @@ static int fespi_wip(volatile uint32_t *ctrl_base)
/* Can set bits 23:20 in result. */
static int fespi_write_buffer(volatile uint32_t *ctrl_base,
- const uint8_t *buffer, unsigned offset, unsigned len,
+ const uint8_t *buffer, unsigned int offset, unsigned int len,
uint32_t flash_info)
{
int result = fespi_tx(ctrl_base, SPIFLASH_WRITE_ENABLE);
@@ -304,7 +304,7 @@ static int fespi_write_buffer(volatile uint32_t *ctrl_base,
if (result != ERROR_OK)
return result | ERROR_STACK(0x600000);
- for (unsigned i = 0; i < len; i++) {
+ for (unsigned int i = 0; i < len; i++) {
result = fespi_tx(ctrl_base, buffer[i]);
if (result != ERROR_OK)
return result | ERROR_STACK(0x700000);
-----------------------------------------------------------------------
Summary of changes:
contrib/itmdump.c | 24 ++++++++++++------------
contrib/loaders/flash/fespi/riscv_fespi.c | 20 ++++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:07:08
|
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 40d58ce5290a51c58615c4f95912b69fa7975aea (commit)
from 3b261fb155dd9165c39fc848bd66aae2e5dea370 (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 40d58ce5290a51c58615c4f95912b69fa7975aea
Author: MicBiso <mic...@re...>
Date: Wed Apr 10 12:38:09 2024 +0200
tcl/target/renesas_rz_g2: Rename to renesas_rz and add RZ/V2L-G3S
Rename file to get it more generic and add more targets belonging
to the same family.
Add support for two new devices: RZ/V2L and RZ/G3S
Change-Id: Idb7f4d81d2f95ad15ef686e940f43ed29f49f343
Signed-off-by: MicBiso <mic...@re...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8211
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/tcl/target/renesas_rz_g2.cfg b/tcl/target/renesas_rz.cfg
similarity index 70%
rename from tcl/target/renesas_rz_g2.cfg
rename to tcl/target/renesas_rz.cfg
index a3d5f48fb..a0489de3d 100644
--- a/tcl/target/renesas_rz_g2.cfg
+++ b/tcl/target/renesas_rz.cfg
@@ -1,23 +1,25 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-# Renesas RZ/G2 SOCs
+# Renesas RZ SOCs
# - There are a combination of Cortex-A57s, Cortex-A53s, Cortex-A55, Cortex-R7
# and Cortex-M33 for each SOC
-# - Each SOC can boot through the Cortex-A5x cores
+# - Each SOC can boot through the Cortex-A5x cores or the Cortex-M33
-# Supported RZ/G2 SOCs and their cores:
+# Supported RZ SOCs and their cores:
# RZ/G2H: Cortex-A57 x4, Cortex-A53 x4, Cortex-R7
# RZ/G2M: Cortex-A57 x2, Cortex-A53 x4, Cortex-R7
# RZ/G2N: Cortex-A57 x2, Cortex-R7
# RZ/G2E: Cortex-A53 x2, Cortex-R7
# RZ/G2L: Cortex-A55 x2, Cortex-M33
+# RZ/V2L: Cortex-A55 x2, Cortex-M33
# RZ/G2LC: Cortex-A55 x2, Cortex-M33
# RZ/G2UL: Cortex-A55 x1, Cortex-M33
+# RZ/G3S: Cortex-A55 x1, Cortex-M33 x2
# Usage:
# There are 2 configuration options:
# SOC: Selects the supported SOC. (Default 'G2L')
-# BOOT_CORE: Selects the booting core. 'CA57', 'CA53' or 'CA55'
+# BOOT_CORE: Selects the booting core. 'CA57', 'CA53', 'CA55' or CM33
transport select jtag
reset_config trst_and_srst srst_gates_jtag
@@ -77,6 +79,13 @@ switch $_soc {
set _boot_core CA55
set _ap_num 0
}
+ V2L {
+ set _CHIPNAME r9a07g054l
+ set _num_ca55 2
+ set _num_cm33 1
+ set _boot_core CA55
+ set _ap_num 0
+ }
G2LC {
set _CHIPNAME r9a07g044c
set _num_ca55 2
@@ -91,6 +100,13 @@ switch $_soc {
set _boot_core CA55
set _ap_num 0
}
+ G3S {
+ set _CHIPNAME r9a08g045s
+ set _num_ca55 1
+ set _num_cm33 2
+ set _boot_core CA55
+ set _ap_num 0
+ }
default {
error "'$_soc' is invalid!"
}
@@ -112,16 +128,16 @@ if { [info exists DAP_TAPID] } {
set _DAP_TAPID 0x6ba00477
}
-echo "\t$_soc - $_num_ca57 CA57(s), $_num_ca55 CA55(s), $_num_ca53 CA53(s), $_num_cr7 CR7(s), \
- $_num_cm33 CM33(s)"
+echo "\t$_soc - $_num_ca57 CA57(s), $_num_ca55 CA55(s), $_num_ca53 CA53(s), \
+ $_num_cr7 CR7(s), $_num_cm33 CM33(s)"
echo "\tBoot Core - $_boot_core\n"
set _DAPNAME $_CHIPNAME.dap
# TAP and DAP
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_DAP_TAPID \
- -ignore-version
+jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf \
+ -expected-id $_DAP_TAPID -ignore-version
dap create $_DAPNAME -chain-position $_CHIPNAME.cpu
echo "$_CHIPNAME.cpu"
@@ -133,8 +149,8 @@ set CA53_DBGBASE {0x80C10000 0x80D10000 0x80E10000 0x80F10000}
set CA53_CTIBASE {0x80C20000 0x80D20000 0x80E20000 0x80F20000}
set CR7_DBGBASE 0x80910000
set CR7_CTIBASE 0x80918000
-set CM33_DBGBASE 0xE000E000
-set CM33_CTIBASE 0xE0042000
+set CM33_DBGBASE {0xE000E000 0xE010E000}
+set CM33_CTIBASE {0xE0042000 0xE0142000}
set smp_targets ""
@@ -145,7 +161,8 @@ proc setup_a5x {core_name dbgbase ctibase num boot} {
cti create $_CTINAME -dap $::_DAPNAME -ap-num $::_ap_num \
-baseaddr [lindex $ctibase $_core]
target create $_TARGETNAME aarch64 -dap $::_DAPNAME \
- -ap-num $::_ap_num -dbgbase [lindex $dbgbase $_core] -cti $_CTINAME
+ -ap-num $::_ap_num -dbgbase [lindex $dbgbase $_core] \
+ -cti $_CTINAME
if { $_core > 0 || $boot == 0 } {
$_TARGETNAME configure -defer-examine
}
@@ -160,13 +177,29 @@ proc setup_cr7 {dbgbase ctibase} {
target create $_TARGETNAME cortex_r4 -dap $::_DAPNAME \
-ap-num 1 -dbgbase $dbgbase -defer-examine
}
-
-proc setup_cm33 {dbgbase ctibase} {
- set _TARGETNAME $::_CHIPNAME.m33
- set _CTINAME $_TARGETNAME.cti
- cti create $_CTINAME -dap $::_DAPNAME -ap-num 2 -baseaddr $ctibase
- target create $_TARGETNAME cortex_m -dap $::_DAPNAME \
- -ap-num 2 -dbgbase $dbgbase -defer-examine
+proc setup_cm33 {dbgbase ctibase num boot} {
+ if { $::_soc == "G2L" || $::_soc == "V2L" \
+ || $::_soc == "G2LC" || $::_soc == "G2UL" } {
+ set _ap_num 2
+ } elseif { $::_soc == "G3S" } {
+ set _ap_num 3
+ }
+ for { set _core 0 } { $_core < $num } { incr _core } {
+ if { $num <= 1 } {
+ set _TARGETNAME $::_CHIPNAME.m33
+ } else {
+ set _TARGETNAME $::_CHIPNAME.m33.$_core
+ }
+ set _CTINAME $_TARGETNAME.cti
+ cti create $_CTINAME -dap $::_DAPNAME -ap-num $_ap_num \
+ -baseaddr [lindex $ctibase $_core]
+ target create $_TARGETNAME cortex_m -dap $::_DAPNAME \
+ -ap-num $_ap_num -dbgbase [lindex $dbgbase $_core]
+ if { $boot == 0 } {
+ $_TARGETNAME configure -defer-examine
+ }
+ incr $_ap_num
+ }
}
# Organize target list based on the boot core
@@ -180,12 +213,17 @@ if { $_boot_core == "CA57" } {
setup_cr7 $CR7_DBGBASE $CR7_CTIBASE
} elseif { $_boot_core == "CA55" } {
setup_a5x a55 $CA55_DBGBASE $CA55_CTIBASE $_num_ca55 1
- setup_cm33 $CM33_DBGBASE $CM33_CTIBASE
+ setup_cm33 $CM33_DBGBASE $CM33_CTIBASE $_num_cm33 0
+} elseif { $_boot_core == "CM33" } {
+ setup_a5x a55 $CA55_DBGBASE $CA55_CTIBASE $_num_ca55 0
+ setup_cm33 $CM33_DBGBASE $CM33_CTIBASE $_num_cm33 1
}
+
echo "SMP targets:$smp_targets"
eval "target smp $smp_targets"
-if { $_soc == "G2L" || $_soc == "G2LC" || $_soc == "G2UL" } {
+if { $_soc == "G2L" || $_soc == "V2L" || $_soc == "G2LC" \
+|| $_soc == "G2UL" || $_soc == "G3S"} {
target create $_CHIPNAME.axi_ap mem_ap -dap $_DAPNAME -ap-num 1
}
-----------------------------------------------------------------------
Summary of changes:
tcl/target/{renesas_rz_g2.cfg => renesas_rz.cfg} | 78 ++++++++++++++++++------
1 file changed, 58 insertions(+), 20 deletions(-)
rename tcl/target/{renesas_rz_g2.cfg => renesas_rz.cfg} (70%)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:06:35
|
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 3b261fb155dd9165c39fc848bd66aae2e5dea370 (commit)
from 337db329c9c30a58ffa08c01691f12dd95890cbb (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 3b261fb155dd9165c39fc848bd66aae2e5dea370
Author: Marc Schink <de...@za...>
Date: Fri Aug 30 11:22:17 2024 +0200
adapter/parport: Coding style changes
Apply some coding style changes according to the C style guide. The
patch is tested for regression with the 'wiggler' parallel port cable.
Change-Id: I43774f596831d8c46f90f18893418178041a930b
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8516
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index d03d3b89c..bdd338895 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -45,21 +45,31 @@
#include <windows.h>
#endif
-/* parallel port cable description
- */
+// Parallel port cable description.
struct cable {
const char *name;
- uint8_t TDO_MASK; /* status port bit containing current TDO value */
- uint8_t TRST_MASK; /* data port bit for TRST */
- uint8_t TMS_MASK; /* data port bit for TMS */
- uint8_t TCK_MASK; /* data port bit for TCK */
- uint8_t TDI_MASK; /* data port bit for TDI */
- uint8_t SRST_MASK; /* data port bit for SRST */
- uint8_t OUTPUT_INVERT; /* data port bits that should be inverted */
- uint8_t INPUT_INVERT; /* status port that should be inverted */
- uint8_t PORT_INIT; /* initialize data port with this value */
- uint8_t PORT_EXIT; /* de-initialize data port with this value */
- uint8_t LED_MASK; /* data port bit for LED */
+ // Status port bit containing current TDO value.
+ uint8_t tdo_mask;
+ // Data port bit for TRST.
+ uint8_t trst_mask;
+ // Data port bit for TMD.
+ uint8_t tms_mask;
+ // Data port bit for TCK.
+ uint8_t tck_mask;
+ // Data port bit for TDI.
+ uint8_t tdi_mask;
+ // Data port bit for SRST.
+ uint8_t srst_mask;
+ // Data port bits that should be inverted.
+ uint8_t output_invert;
+ // Status port that should be inverted.
+ uint8_t input_invert;
+ // Initialize data port with this value.
+ uint8_t port_init;
+ // De-initialize data port with this value.
+ uint8_t port_exit;
+ // Data port bit for LED.
+ uint8_t led_mask;
};
static const struct cable cables[] = {
@@ -87,15 +97,14 @@ static const struct cable cables[] = {
{ NULL, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
};
-/* configuration */
+// Configuration variables.
static char *parport_cable;
static uint16_t parport_port;
static bool parport_exit;
static uint32_t parport_toggling_time_ns = 1000;
static int wait_states;
-/* interface variables
- */
+// Interface variables.
static const struct cable *cable;
static uint8_t dataport_value;
@@ -116,7 +125,7 @@ static bb_value_t parport_read(void)
data = inb(statusport);
#endif
- if ((data ^ cable->INPUT_INVERT) & cable->TDO_MASK)
+ if ((data ^ cable->input_invert) & cable->tdo_mask)
return BB_HIGH;
else
return BB_LOW;
@@ -125,7 +134,7 @@ static bb_value_t parport_read(void)
static inline void parport_write_data(void)
{
uint8_t output;
- output = dataport_value ^ cable->OUTPUT_INVERT;
+ output = dataport_value ^ cable->output_invert;
#if PARPORT_USE_PPDEV == 1
ioctl(device_handle, PPWDATA, &output);
@@ -143,19 +152,19 @@ static int parport_write(int tck, int tms, int tdi)
int i = wait_states + 1;
if (tck)
- dataport_value |= cable->TCK_MASK;
+ dataport_value |= cable->tck_mask;
else
- dataport_value &= ~cable->TCK_MASK;
+ dataport_value &= ~cable->tck_mask;
if (tms)
- dataport_value |= cable->TMS_MASK;
+ dataport_value |= cable->tms_mask;
else
- dataport_value &= ~cable->TMS_MASK;
+ dataport_value &= ~cable->tms_mask;
if (tdi)
- dataport_value |= cable->TDI_MASK;
+ dataport_value |= cable->tdi_mask;
else
- dataport_value &= ~cable->TDI_MASK;
+ dataport_value &= ~cable->tdi_mask;
while (i-- > 0)
parport_write_data();
@@ -163,33 +172,32 @@ static int parport_write(int tck, int tms, int tdi)
return ERROR_OK;
}
-/* (1) assert or (0) deassert reset lines */
+// (1) assert or (0) deassert reset lines.
static int parport_reset(int trst, int srst)
{
LOG_DEBUG("trst: %i, srst: %i", trst, srst);
if (trst == 0)
- dataport_value |= cable->TRST_MASK;
+ dataport_value |= cable->trst_mask;
else if (trst == 1)
- dataport_value &= ~cable->TRST_MASK;
+ dataport_value &= ~cable->trst_mask;
if (srst == 0)
- dataport_value |= cable->SRST_MASK;
+ dataport_value |= cable->srst_mask;
else if (srst == 1)
- dataport_value &= ~cable->SRST_MASK;
+ dataport_value &= ~cable->srst_mask;
parport_write_data();
return ERROR_OK;
}
-/* turn LED on parport adapter on (true) or off (true) */
static int parport_led(bool on)
{
if (on)
- dataport_value |= cable->LED_MASK;
+ dataport_value |= cable->led_mask;
else
- dataport_value &= ~cable->LED_MASK;
+ dataport_value &= ~cable->led_mask;
parport_write_data();
@@ -204,7 +212,7 @@ static int parport_speed(int speed)
static int parport_khz(int khz, int *jtag_speed)
{
- if (khz == 0) {
+ if (!khz) {
LOG_DEBUG("RCLK not supported");
return ERROR_FAIL;
}
@@ -248,10 +256,10 @@ static int parport_get_giveio_access(void)
#endif
static struct bitbang_interface parport_bitbang = {
- .read = &parport_read,
- .write = &parport_write,
- .blink = &parport_led,
- };
+ .read = &parport_read,
+ .write = &parport_write,
+ .blink = &parport_led,
+};
static int parport_init(void)
{
@@ -268,7 +276,7 @@ static int parport_init(void)
}
while (cur_cable->name) {
- if (strcmp(cur_cable->name, parport_cable) == 0) {
+ if (!strcmp(cur_cable->name, parport_cable)) {
cable = cur_cable;
break;
}
@@ -280,7 +288,7 @@ static int parport_init(void)
return ERROR_JTAG_INIT_FAILED;
}
- dataport_value = cable->PORT_INIT;
+ dataport_value = cable->port_init;
#if PARPORT_USE_PPDEV == 1
if (device_handle > 0) {
@@ -332,7 +340,7 @@ static int parport_init(void)
#endif /* not __FreeBSD__, __FreeBSD_kernel__ */
#else /* not PARPORT_USE_PPDEV */
- if (parport_port == 0) {
+ if (!parport_port) {
parport_port = 0x378;
LOG_WARNING("No parport port specified, using default '0x378' (LPT1)");
}
@@ -351,7 +359,7 @@ static int parport_init(void)
}
LOG_DEBUG("...privileges granted");
- /* make sure parallel port is in right mode (clear tristate and interrupt */
+ // Make sure parallel port is in right mode (clear tristate and interrupt.
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
outb(parport_port + 2, 0x0);
#else
@@ -378,7 +386,7 @@ static int parport_quit(void)
return ERROR_FAIL;
if (parport_exit) {
- dataport_value = cable->PORT_EXIT;
+ dataport_value = cable->port_exit;
parport_write_data();
}
@@ -388,13 +396,13 @@ static int parport_quit(void)
return ERROR_OK;
}
-COMMAND_HANDLER(parport_handle_parport_port_command)
+COMMAND_HANDLER(parport_handle_port_command)
{
if (CMD_ARGC == 1) {
- /* only if the port wasn't overwritten by cmdline */
- if (parport_port == 0)
+ // Only if the port wasn't overwritten by cmdline.
+ if (!parport_port) {
COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], parport_port);
- else {
+ } else {
LOG_ERROR("The parport port was already configured!");
return ERROR_FAIL;
}
@@ -405,14 +413,14 @@ COMMAND_HANDLER(parport_handle_parport_port_command)
return ERROR_OK;
}
-COMMAND_HANDLER(parport_handle_parport_cable_command)
+COMMAND_HANDLER(parport_handle_cable_command)
{
- if (CMD_ARGC == 0)
+ if (!CMD_ARGC)
return ERROR_OK;
- /* only if the cable name wasn't overwritten by cmdline */
+ // Only if the cable name wasn't overwritten by cmdline.
if (!parport_cable) {
- /* REVISIT first verify that it's listed in cables[] ... */
+ // TODO: REVISIT first verify that it's listed in cables[].
parport_cable = malloc(strlen(CMD_ARGV[0]) + sizeof(char));
if (!parport_cable) {
LOG_ERROR("Out of memory");
@@ -421,7 +429,7 @@ COMMAND_HANDLER(parport_handle_parport_cable_command)
strcpy(parport_cable, CMD_ARGV[0]);
}
- /* REVISIT it's probably worth returning the current value ... */
+ // TODO: REVISIT it's probably worth returning the current value.
return ERROR_OK;
}
@@ -436,7 +444,7 @@ COMMAND_HANDLER(parport_handle_write_on_exit_command)
return ERROR_OK;
}
-COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
+COMMAND_HANDLER(parport_handle_toggling_time_command)
{
if (CMD_ARGC == 1) {
uint32_t ns;
@@ -445,7 +453,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
if (retval != ERROR_OK)
return retval;
- if (ns == 0) {
+ if (!ns) {
LOG_ERROR("0 ns is not a valid parport toggling time");
return ERROR_FAIL;
}
@@ -453,9 +461,11 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
parport_toggling_time_ns = ns;
retval = adapter_get_speed(&wait_states);
if (retval != ERROR_OK) {
- /* if adapter_get_speed fails then the clock_mode
- * has not been configured, this happens if parport_toggling_time is
- * called before the adapter speed is set */
+ /*
+ * If adapter_get_speed fails then the clock_mode has
+ * not been configured, this happens if toggling_time is
+ * called before the adapter speed is set.
+ */
LOG_INFO("no parport speed set - defaulting to zero wait states");
wait_states = 0;
}
@@ -470,7 +480,7 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
static const struct command_registration parport_subcommand_handlers[] = {
{
.name = "port",
- .handler = parport_handle_parport_port_command,
+ .handler = parport_handle_port_command,
.mode = COMMAND_CONFIG,
.help = "Display the address of the I/O port (e.g. 0x378) "
"or the number of the '/dev/parport' device used. "
@@ -479,11 +489,11 @@ static const struct command_registration parport_subcommand_handlers[] = {
},
{
.name = "cable",
- .handler = parport_handle_parport_cable_command,
+ .handler = parport_handle_cable_command,
.mode = COMMAND_CONFIG,
.help = "Set the layout of the parallel port cable "
"used to connect to the target.",
- /* REVISIT there's no way to list layouts we know ... */
+ // TODO: REVISIT there's no way to list layouts we know.
.usage = "[layout]",
},
{
@@ -496,7 +506,7 @@ static const struct command_registration parport_subcommand_handlers[] = {
},
{
.name = "toggling_time",
- .handler = parport_handle_parport_toggling_time_command,
+ .handler = parport_handle_toggling_time_command,
.mode = COMMAND_CONFIG,
.help = "Displays or assigns how many nanoseconds it "
"takes for the hardware to toggle TCK.",
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/parport.c | 130 ++++++++++++++++++++++++---------------------
1 file changed, 70 insertions(+), 60 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:06:05
|
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 337db329c9c30a58ffa08c01691f12dd95890cbb (commit)
from f4d81cd4d49336f695b8d4b00aa0afdbc6ea22cd (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 337db329c9c30a58ffa08c01691f12dd95890cbb
Author: Marc Schink <de...@za...>
Date: Fri Aug 30 11:06:13 2024 +0200
adapter/bitbang: Use 'bool' data type for blink()
Change-Id: I187f8944ad5fd92f28cbd32e447f9ec1a97e16d6
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8515
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/src/jtag/drivers/am335xgpio.c b/src/jtag/drivers/am335xgpio.c
index cfe41c3be..9bb7ea7d1 100644
--- a/src/jtag/drivers/am335xgpio.c
+++ b/src/jtag/drivers/am335xgpio.c
@@ -275,10 +275,10 @@ static int am335xgpio_swdio_read(void)
return get_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_SWDIO]);
}
-static int am335xgpio_blink(int on)
+static int am335xgpio_blink(bool on)
{
if (is_gpio_config_valid(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED]))
- set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on);
+ set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on ? 1 : 0);
return ERROR_OK;
}
diff --git a/src/jtag/drivers/bcm2835gpio.c b/src/jtag/drivers/bcm2835gpio.c
index b8d91bf38..2c2061dae 100644
--- a/src/jtag/drivers/bcm2835gpio.c
+++ b/src/jtag/drivers/bcm2835gpio.c
@@ -419,10 +419,10 @@ static void bcm2835gpio_munmap(void)
}
}
-static int bcm2835gpio_blink(int on)
+static int bcm2835gpio_blink(bool on)
{
if (is_gpio_config_valid(ADAPTER_GPIO_IDX_LED))
- set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on);
+ set_gpio_value(&adapter_gpio_config[ADAPTER_GPIO_IDX_LED], on ? 1 : 0);
return ERROR_OK;
}
diff --git a/src/jtag/drivers/bitbang.c b/src/jtag/drivers/bitbang.c
index 17e01a233..42234a6f7 100644
--- a/src/jtag/drivers/bitbang.c
+++ b/src/jtag/drivers/bitbang.c
@@ -309,7 +309,7 @@ int bitbang_execute_queue(struct jtag_command *cmd_queue)
retval = ERROR_OK;
if (bitbang_interface->blink) {
- if (bitbang_interface->blink(1) != ERROR_OK)
+ if (bitbang_interface->blink(true) != ERROR_OK)
return ERROR_FAIL;
}
@@ -377,7 +377,7 @@ int bitbang_execute_queue(struct jtag_command *cmd_queue)
cmd = cmd->next;
}
if (bitbang_interface->blink) {
- if (bitbang_interface->blink(0) != ERROR_OK)
+ if (bitbang_interface->blink(false) != ERROR_OK)
return ERROR_FAIL;
}
@@ -396,7 +396,7 @@ static void bitbang_swd_exchange(bool rnw, uint8_t buf[], unsigned int offset, u
{
if (bitbang_interface->blink) {
/* FIXME: we should manage errors */
- bitbang_interface->blink(1);
+ bitbang_interface->blink(true);
}
for (unsigned int i = offset; i < bit_cnt + offset; i++) {
@@ -418,7 +418,7 @@ static void bitbang_swd_exchange(bool rnw, uint8_t buf[], unsigned int offset, u
if (bitbang_interface->blink) {
/* FIXME: we should manage errors */
- bitbang_interface->blink(0);
+ bitbang_interface->blink(false);
}
}
diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h
index dc941796e..82405eb8a 100644
--- a/src/jtag/drivers/bitbang.h
+++ b/src/jtag/drivers/bitbang.h
@@ -45,7 +45,7 @@ struct bitbang_interface {
int (*write)(int tck, int tms, int tdi);
/** Blink led (optional). */
- int (*blink)(int on);
+ int (*blink)(bool on);
/** Sample SWDIO and return the value. */
int (*swdio_read)(void);
diff --git a/src/jtag/drivers/dummy.c b/src/jtag/drivers/dummy.c
index 1b1e57392..4fe598fe3 100644
--- a/src/jtag/drivers/dummy.c
+++ b/src/jtag/drivers/dummy.c
@@ -72,7 +72,7 @@ static int dummy_reset(int trst, int srst)
return ERROR_OK;
}
-static int dummy_led(int on)
+static int dummy_led(bool on)
{
return ERROR_OK;
}
diff --git a/src/jtag/drivers/linuxgpiod.c b/src/jtag/drivers/linuxgpiod.c
index 1926ed9ae..fa14e42d6 100644
--- a/src/jtag/drivers/linuxgpiod.c
+++ b/src/jtag/drivers/linuxgpiod.c
@@ -178,14 +178,14 @@ static int linuxgpiod_swd_write(int swclk, int swdio)
return ERROR_OK;
}
-static int linuxgpiod_blink(int on)
+static int linuxgpiod_blink(bool on)
{
int retval;
if (!is_gpio_config_valid(ADAPTER_GPIO_IDX_LED))
return ERROR_OK;
- retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_LED], on);
+ retval = gpiod_line_set_value(gpiod_line[ADAPTER_GPIO_IDX_LED], on ? 1 : 0);
if (retval < 0)
LOG_WARNING("Fail set led");
return retval;
diff --git a/src/jtag/drivers/parport.c b/src/jtag/drivers/parport.c
index d26a51048..d03d3b89c 100644
--- a/src/jtag/drivers/parport.c
+++ b/src/jtag/drivers/parport.c
@@ -183,8 +183,8 @@ static int parport_reset(int trst, int srst)
return ERROR_OK;
}
-/* turn LED on parport adapter on (1) or off (0) */
-static int parport_led(int on)
+/* turn LED on parport adapter on (true) or off (true) */
+static int parport_led(bool on)
{
if (on)
dataport_value |= cable->LED_MASK;
@@ -364,7 +364,7 @@ static int parport_init(void)
return ERROR_FAIL;
if (parport_write(0, 0, 0) != ERROR_OK)
return ERROR_FAIL;
- if (parport_led(1) != ERROR_OK)
+ if (parport_led(true) != ERROR_OK)
return ERROR_FAIL;
bitbang_interface = &parport_bitbang;
@@ -374,7 +374,7 @@ static int parport_init(void)
static int parport_quit(void)
{
- if (parport_led(0) != ERROR_OK)
+ if (parport_led(false) != ERROR_OK)
return ERROR_FAIL;
if (parport_exit) {
diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c
index edd36f2e6..91a8532b7 100644
--- a/src/jtag/drivers/remote_bitbang.c
+++ b/src/jtag/drivers/remote_bitbang.c
@@ -251,7 +251,7 @@ static int remote_bitbang_sleep(unsigned int microseconds)
return remote_bitbang_flush();
}
-static int remote_bitbang_blink(int on)
+static int remote_bitbang_blink(bool on)
{
char c = on ? 'B' : 'b';
return remote_bitbang_queue(c, FLUSH_SEND_BUF);
-----------------------------------------------------------------------
Summary of changes:
src/jtag/drivers/am335xgpio.c | 4 ++--
src/jtag/drivers/bcm2835gpio.c | 4 ++--
src/jtag/drivers/bitbang.c | 8 ++++----
src/jtag/drivers/bitbang.h | 2 +-
src/jtag/drivers/dummy.c | 2 +-
src/jtag/drivers/linuxgpiod.c | 4 ++--
src/jtag/drivers/parport.c | 8 ++++----
src/jtag/drivers/remote_bitbang.c | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:05:25
|
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 f4d81cd4d49336f695b8d4b00aa0afdbc6ea22cd (commit)
from 99f60d5e594278b876142a957090d8649d5e6c44 (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 f4d81cd4d49336f695b8d4b00aa0afdbc6ea22cd
Author: Marc Schink <de...@za...>
Date: Fri Aug 30 10:47:55 2024 +0200
tcl/interface: Restructure parport config files
Provide cable specific configuration files like for the FTDI interface.
Depcrecate the old configuration files but keep them until the next
release for compatibility reasons.
Change-Id: I436bd60779a107120c9e1b1f0b8a69a39a240ad4
Signed-off-by: Marc Schink <de...@za...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8514
Reviewed-by: Antonio Borneo <bor...@gm...>
Tested-by: jenkins
diff --git a/tcl/interface/parport.cfg b/tcl/interface/parport.cfg
index b9fceeb85..8fb1c148b 100644
--- a/tcl/interface/parport.cfg
+++ b/tcl/interface/parport.cfg
@@ -5,17 +5,6 @@
#
# Addresses: 0x378/LPT1 or 0x278/LPT2 ...
#
+echo "DEPRECATED: use interface/parport/wiggler.cfg instead of deprecated interface/parport.cfg"
-if { [info exists PARPORTADDR] } {
- set _PARPORTADDR $PARPORTADDR
-} else {
- if {$tcl_platform(platform) eq "windows"} {
- set _PARPORTADDR 0x378
- } {
- set _PARPORTADDR 0
- }
-}
-
-adapter driver parport
-parport port $_PARPORTADDR
-parport cable wiggler
+source [find interface/parport/wiggler.cfg]
diff --git a/tcl/interface/parport_dlc5.cfg b/tcl/interface/parport/dlc5.cfg
similarity index 100%
copy from tcl/interface/parport_dlc5.cfg
copy to tcl/interface/parport/dlc5.cfg
diff --git a/tcl/interface/parport.cfg b/tcl/interface/parport/wiggler.cfg
similarity index 100%
copy from tcl/interface/parport.cfg
copy to tcl/interface/parport/wiggler.cfg
diff --git a/tcl/interface/parport_dlc5.cfg b/tcl/interface/parport_dlc5.cfg
index 24acea7a9..83f3b56c4 100644
--- a/tcl/interface/parport_dlc5.cfg
+++ b/tcl/interface/parport_dlc5.cfg
@@ -5,13 +5,6 @@
#
# http://www.xilinx.com/itp/xilinx4/data/docs/pac/appendixb.html
#
+echo "DEPRECATED: use interface/parport/dlc5.cfg instead of deprecated interface/parport_dlc5.cfg"
-if { [info exists PARPORTADDR] } {
- set _PARPORTADDR $PARPORTADDR
-} else {
- set _PARPORTADDR 0
-}
-
-adapter driver parport
-parport port $_PARPORTADDR
-parport cable dlc5
+source [find interface/parport/dlc5.cfg]
-----------------------------------------------------------------------
Summary of changes:
tcl/interface/parport.cfg | 15 ++-------------
tcl/interface/{parport_dlc5.cfg => parport/dlc5.cfg} | 0
tcl/interface/{parport.cfg => parport/wiggler.cfg} | 0
tcl/interface/parport_dlc5.cfg | 11 ++---------
4 files changed, 4 insertions(+), 22 deletions(-)
copy tcl/interface/{parport_dlc5.cfg => parport/dlc5.cfg} (100%)
copy tcl/interface/{parport.cfg => parport/wiggler.cfg} (100%)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:04:08
|
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 99f60d5e594278b876142a957090d8649d5e6c44 (commit)
from b95633b30c35058005f7d69578773944e32e98e5 (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 99f60d5e594278b876142a957090d8649d5e6c44
Author: Mark Zhuang <mar...@sp...>
Date: Sat Oct 26 10:15:00 2024 +0800
jtag: convert 'unsigned' to 'unsigned int'
Conversion done with
checkpatch --fix-inplace -types UNSPECIFIED_INT
Change-Id: I2c2d56aa98e89bcc6088a1bd51d70066d67d6dad
Signed-off-by: Mark Zhuang <mar...@sp...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8367
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index f284278dd..e826f7910 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -76,7 +76,7 @@ int hl_interface_init_target(struct target *t)
if (res != ERROR_OK)
return res;
- unsigned ii, limit = t->tap->expected_ids_cnt;
+ unsigned int ii, limit = t->tap->expected_ids_cnt;
int found = 0;
for (ii = 0; ii < limit; ii++) {
@@ -264,7 +264,7 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command)
return ERROR_COMMAND_SYNTAX_ERROR;
}
- unsigned i;
+ unsigned int i;
for (i = 0; i < CMD_ARGC; i += 2) {
COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i], hl_if.param.vid[i / 2]);
COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i + 1], hl_if.param.pid[i / 2]);
-----------------------------------------------------------------------
Summary of changes:
src/jtag/hla/hla_interface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:03:52
|
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 b95633b30c35058005f7d69578773944e32e98e5 (commit)
from 114ad468ca6be45e25cfc1a521f04f959cc76159 (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 b95633b30c35058005f7d69578773944e32e98e5
Author: Mark Zhuang <mar...@sp...>
Date: Sat Oct 26 11:09:16 2024 +0800
flash: convert 'unsigned' to 'unsigned int'
Change-Id: I8e8da78385eed714524891b580e19a79cfb459d3
Signed-off-by: Mark Zhuang <mar...@sp...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8370
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/flash/nand/mx3.h b/src/flash/nand/mx3.h
index b272962b4..648cd86cc 100644
--- a/src/flash/nand/mx3.h
+++ b/src/flash/nand/mx3.h
@@ -86,10 +86,10 @@ enum mx_nf_finalize_action {
};
struct mx3_nf_flags {
- unsigned target_little_endian:1;
- unsigned nand_readonly:1;
- unsigned one_kb_sram:1;
- unsigned hw_ecc_enabled:1;
+ unsigned int target_little_endian:1;
+ unsigned int nand_readonly:1;
+ unsigned int one_kb_sram:1;
+ unsigned int hw_ecc_enabled:1;
};
struct mx3_nf_controller {
diff --git a/src/flash/nand/mxc.h b/src/flash/nand/mxc.h
index ae2c03a75..e9dc0a2f3 100644
--- a/src/flash/nand/mxc.h
+++ b/src/flash/nand/mxc.h
@@ -138,11 +138,11 @@ enum mxc_nf_finalize_action {
};
struct mxc_nf_flags {
- unsigned target_little_endian:1;
- unsigned nand_readonly:1;
- unsigned one_kb_sram:1;
- unsigned hw_ecc_enabled:1;
- unsigned biswap_enabled:1;
+ unsigned int target_little_endian:1;
+ unsigned int nand_readonly:1;
+ unsigned int one_kb_sram:1;
+ unsigned int hw_ecc_enabled:1;
+ unsigned int biswap_enabled:1;
};
struct mxc_nf_controller {
-----------------------------------------------------------------------
Summary of changes:
src/flash/nand/mx3.h | 8 ++++----
src/flash/nand/mxc.h | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:03:37
|
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 114ad468ca6be45e25cfc1a521f04f959cc76159 (commit)
from 134e56338d365319380092a7bc5becf82c6d47f2 (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 114ad468ca6be45e25cfc1a521f04f959cc76159
Author: Mark Zhuang <mar...@sp...>
Date: Sat Oct 26 10:42:03 2024 +0800
server: convert 'unsigned' to 'unsigned int'
Conversion done with
checkpatch --fix-inplace -types UNSPECIFIED_INT
Ignore the cast as they could be better addressed.
Change-Id: Ib0cbd9388d61659f8d47c8f57c09baa6df123487
Signed-off-by: Mark Zhuang <mar...@sp...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8369
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 579a388d2..c572f392a 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -116,7 +116,7 @@ static int gdb_error(struct connection *connection, int retval);
static char *gdb_port;
static char *gdb_port_next;
-static void gdb_log_callback(void *priv, const char *file, unsigned line,
+static void gdb_log_callback(void *priv, const char *file, unsigned int line,
const char *function, const char *string);
static void gdb_sig_halted(struct connection *connection);
@@ -360,7 +360,7 @@ static void gdb_log_incoming_packet(struct connection *connection, const char *p
struct gdb_connection *gdb_connection = connection->priv;
/* Avoid dumping non-printable characters to the terminal */
- const unsigned packet_len = strlen(packet);
+ const unsigned int packet_len = strlen(packet);
const char *nonprint = find_nonprint_char(packet, packet_len);
if (nonprint) {
/* Does packet at least have a prefix that is printable?
@@ -1203,7 +1203,7 @@ static void gdb_target_to_reg(struct target *target,
int i;
for (i = 0; i < str_len; i += 2) {
- unsigned t;
+ unsigned int t;
if (sscanf(tstr + i, "%02x", &t) != 1) {
LOG_ERROR("BUG: unable to convert register value");
exit(-1);
@@ -1948,8 +1948,8 @@ static int gdb_memory_map(struct connection *connection,
compare_bank);
for (unsigned int i = 0; i < target_flash_banks; i++) {
- unsigned sector_size = 0;
- unsigned group_len = 0;
+ unsigned int sector_size = 0;
+ unsigned int group_len = 0;
p = banks[i];
@@ -3469,7 +3469,7 @@ static int gdb_fileio_response_packet(struct connection *connection,
return ERROR_OK;
}
-static void gdb_log_callback(void *priv, const char *file, unsigned line,
+static void gdb_log_callback(void *priv, const char *file, unsigned int line,
const char *function, const char *string)
{
struct connection *connection = priv;
diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index a596afef0..7818af2db 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -93,7 +93,7 @@ static int telnet_output(struct command_context *cmd_ctx, const char *line)
return telnet_outputline(connection, line);
}
-static void telnet_log_callback(void *priv, const char *file, unsigned line,
+static void telnet_log_callback(void *priv, const char *file, unsigned int line,
const char *function, const char *string)
{
struct connection *connection = priv;
-----------------------------------------------------------------------
Summary of changes:
src/server/gdb_server.c | 12 ++++++------
src/server/telnet_server.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:03:12
|
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 134e56338d365319380092a7bc5becf82c6d47f2 (commit)
from 34ec5536c0ba3315bc5a841244bbf70141ccfbb4 (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 134e56338d365319380092a7bc5becf82c6d47f2
Author: Mark Zhuang <mar...@sp...>
Date: Fri Oct 25 22:15:29 2024 +0800
target: riscv: convert 'unsigned' to 'unsigned int'
Change-Id: I10b9abf9e42389eb91b210b8c2f01219ca9068cd
Signed-off-by: Mark Zhuang <mar...@sp...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8366
Tested-by: jenkins
Reviewed-by: Antonio Borneo <bor...@gm...>
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 6c9ed317b..658c1fd9d 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -50,8 +50,7 @@ static bool riscv013_is_halted(struct target *target);
static enum riscv_halt_reason riscv013_halt_reason(struct target *target);
static int riscv013_write_debug_buffer(struct target *target, unsigned int index,
riscv_insn_t d);
-static riscv_insn_t riscv013_read_debug_buffer(struct target *target, unsigned
- index);
+static riscv_insn_t riscv013_read_debug_buffer(struct target *target, unsigned int index);
static int riscv013_execute_debug_buffer(struct target *target);
static void riscv013_fill_dmi_write_u64(struct target *target, char *buf, int a, uint64_t d);
static void riscv013_fill_dmi_read_u64(struct target *target, char *buf, int a);
-----------------------------------------------------------------------
Summary of changes:
src/target/riscv/riscv-013.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
|
From: openocd-gerrit <ope...@us...> - 2024-11-02 21:01:42
|
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 34ec5536c0ba3315bc5a841244bbf70141ccfbb4 (commit)
from 3ce0962f2c525595bcbd0bd5da73673e236fc42d (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 34ec5536c0ba3315bc5a841244bbf70141ccfbb4
Author: Antonio Borneo <bor...@gm...>
Date: Sat Oct 12 11:48:05 2024 +0200
stlink: deprecate HLA support
The STLink API that supports dap-direct is available from STLink
firmware v2j24, published in early 2015.
We can reasonably expect that any old STLink still in use today
has got at least one firmware update during the last 10 years.
Most of the board files in upstream OpenOCD still use the STLink
in HLA mode. This limits the test coverage of the dap-direct code,
which was introduced in OpenOCD v0.11.0.
- Rename interface/stlink.cfg as interface/stlink-hla.cfg to still
provide support for HLA, adding a deprecated message.
- Rename interface/stlink-dap.cfg as interface/stlink.cfg to make
dap-direct the default trasport.
- Add a redirect file interface/stlink-dap.cfg for users that have
out-of-tree custom board files.
- Update all the board files to the new setup.
- Remove STLink HLA mentions from the documentation, while adding
a reference to interface/stlink-hla.cfg
Checkpatch-ignore: LONG_LINE
Change-Id: I99366bb03cd3b83f8f408514e657f30e59813063
Signed-off-by: Antonio Borneo <bor...@gm...>
Reviewed-on: https://review.openocd.org/c/openocd/+/8523
Tested-by: jenkins
Reviewed-by: Andrzej SierżÄga <as...@gm...>
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 97396c7b7..9b5cfbb83 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2489,7 +2489,7 @@ This command is only available if your libusb1 is at least version 1.0.16.
Specifies the @var{serial_string} of the adapter to use.
If this command is not specified, serial strings are not checked.
Only the following adapter drivers use the serial string from this command:
-arm-jtag-ew, cmsis_dap, esp_usb_jtag, ft232r, ftdi, hla (stlink, ti-icdi), jlink, kitprog, opendus,
+arm-jtag-ew, cmsis_dap, esp_usb_jtag, ft232r, ftdi, hla (ti-icdi), jlink, kitprog, opendus,
openjtag, osbdm, presto, rlink, st-link, usb_blaster (ublast2), usbprog, vsllink, xds110.
@end deffn
@@ -3206,7 +3206,7 @@ version reported is V2.J21.S4.
Currently Not Supported.
@end deffn
-@deffn {Config Command} {hla layout} (@option{stlink}|@option{icdi}|@option{nulink})
+@deffn {Config Command} {hla layout} (@option{icdi}|@option{nulink})
Specifies the adapter layout to use.
@end deffn
@@ -3214,15 +3214,6 @@ Specifies the adapter layout to use.
Pairs of vendor IDs and product IDs of the device.
@end deffn
-@deffn {Config Command} {hla stlink_backend} (usb | tcp [port])
-@emph{ST-Link only:} Choose between 'exclusive' USB communication (the default backend) or
-'shared' mode using ST-Link TCP server (the default port is 7184).
-
-@emph{Note:} ST-Link TCP server is a binary application provided by ST
-available from @url{https://www.st.com/en/development-tools/st-link-server.html,
-ST-LINK server software module}.
-@end deffn
-
@deffn {Command} {hla command} command
Execute a custom adapter-specific command. The @var{command} string is
passed as is to the underlying adapter layout handler.
@@ -3232,9 +3223,12 @@ passed as is to the underlying adapter layout handler.
@anchor{st_link_dap_interface}
@deffn {Interface Driver} {st-link}
This is a driver that supports STMicroelectronics adapters ST-LINK/V2
-(from firmware V2J24), STLINK-V3 and STLINK-V3PWR, thanks to a new API that provides
+(from 2015 firmware V2J24), STLINK-V3 and STLINK-V3PWR, thanks to a new API that provides
directly access the arm ADIv5 DAP.
+The older API that requires HLA transport is deprecated and will be dropped
+from OpenOCD. In mean time it's still available by using @file{interface/stlink-hla.cfg}.
+
The new API provide access to multiple AP on the same DAP, but the
maximum number of the AP port is limited by the specific firmware version
(e.g. firmware V2J29 has 3 as maximum AP number, while V2J32 has 8).
@@ -10677,7 +10671,7 @@ baud with our custom divisor to get 12MHz)
@item OpenOCD invocation line:
@example
openocd -f interface/stlink.cfg \
--c "transport select hla_swd" \
+-c "transport select dapdirect_swd" \
-f target/stm32l1.cfg \
-c "stm32l1.tpiu configure -protocol uart" \
-c "stm32l1.tpiu configure -traceclk 24000000 -pin-freq 12000000" \
diff --git a/tcl/board/st_b-l475e-iot01a.cfg b/tcl/board/st_b-l475e-iot01a.cfg
index e75c99d7a..3f3db125c 100644
--- a/tcl/board/st_b-l475e-iot01a.cfg
+++ b/tcl/board/st_b-l475e-iot01a.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 96KB
set WORKAREASIZE 0x18000
diff --git a/tcl/board/st_nucleo_8l152r8.cfg b/tcl/board/st_nucleo_8l152r8.cfg
index 7cb8bcecd..681b5a243 100644
--- a/tcl/board/st_nucleo_8l152r8.cfg
+++ b/tcl/board/st_nucleo_8l152r8.cfg
@@ -3,7 +3,7 @@
# This is a ST NUCLEO 8L152R8 board with a single STM8L152R8T6 chip.
# http://www.st.com/en/evaluation-tools/nucleo-8l152r8.html
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
transport select swim
diff --git a/tcl/board/st_nucleo_8s208rb.cfg b/tcl/board/st_nucleo_8s208rb.cfg
index 0d3c0c912..0f6bde215 100644
--- a/tcl/board/st_nucleo_8s208rb.cfg
+++ b/tcl/board/st_nucleo_8s208rb.cfg
@@ -3,7 +3,7 @@
# This is a ST NUCLEO 8S208RB board with a single STM8S208RBT6 chip.
# https://www.st.com/en/evaluation-tools/nucleo-8s208rb.html
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
transport select swim
diff --git a/tcl/board/st_nucleo_f0.cfg b/tcl/board/st_nucleo_f0.cfg
index 31a95f59d..00c131fd6 100644
--- a/tcl/board/st_nucleo_f0.cfg
+++ b/tcl/board/st_nucleo_f0.cfg
@@ -10,7 +10,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f0x.cfg]
diff --git a/tcl/board/st_nucleo_f103rb.cfg b/tcl/board/st_nucleo_f103rb.cfg
index 9815d4546..892bdda99 100644
--- a/tcl/board/st_nucleo_f103rb.cfg
+++ b/tcl/board/st_nucleo_f103rb.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f1x.cfg]
diff --git a/tcl/board/st_nucleo_f3.cfg b/tcl/board/st_nucleo_f3.cfg
index 883372494..38f49e3d5 100644
--- a/tcl/board/st_nucleo_f3.cfg
+++ b/tcl/board/st_nucleo_f3.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f3x.cfg]
diff --git a/tcl/board/st_nucleo_f4.cfg b/tcl/board/st_nucleo_f4.cfg
index a1908e403..7617a1758 100644
--- a/tcl/board/st_nucleo_f4.cfg
+++ b/tcl/board/st_nucleo_f4.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f4x.cfg]
diff --git a/tcl/board/st_nucleo_f7.cfg b/tcl/board/st_nucleo_f7.cfg
index 9c5b36ea4..41f8b2129 100644
--- a/tcl/board/st_nucleo_f7.cfg
+++ b/tcl/board/st_nucleo_f7.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f7x.cfg]
diff --git a/tcl/board/st_nucleo_g0.cfg b/tcl/board/st_nucleo_g0.cfg
index f8e67a043..f22a7e397 100644
--- a/tcl/board/st_nucleo_g0.cfg
+++ b/tcl/board/st_nucleo_g0.cfg
@@ -12,7 +12,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32g0x.cfg]
diff --git a/tcl/board/st_nucleo_g4.cfg b/tcl/board/st_nucleo_g4.cfg
index 8e583e77d..309f7a4c8 100644
--- a/tcl/board/st_nucleo_g4.cfg
+++ b/tcl/board/st_nucleo_g4.cfg
@@ -12,7 +12,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32g4x.cfg]
diff --git a/tcl/board/st_nucleo_h743zi.cfg b/tcl/board/st_nucleo_h743zi.cfg
index b857b00e0..be2d42fb8 100644
--- a/tcl/board/st_nucleo_h743zi.cfg
+++ b/tcl/board/st_nucleo_h743zi.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32h7x_dual_bank.cfg]
diff --git a/tcl/board/st_nucleo_h745zi.cfg b/tcl/board/st_nucleo_h745zi.cfg
index ad563b7d3..84865f422 100644
--- a/tcl/board/st_nucleo_h745zi.cfg
+++ b/tcl/board/st_nucleo_h745zi.cfg
@@ -2,7 +2,7 @@
# This is an ST NUCLEO-H745ZI-Q board with single STM32H745ZITx chip.
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
transport select dapdirect_swd
# STM32H745xx devices are dual core (Cortex-M7 and Cortex-M4)
diff --git a/tcl/board/st_nucleo_l073rz.cfg b/tcl/board/st_nucleo_l073rz.cfg
index 10fac5ef8..317c86e21 100644
--- a/tcl/board/st_nucleo_l073rz.cfg
+++ b/tcl/board/st_nucleo_l073rz.cfg
@@ -4,7 +4,7 @@
# http://www.st.com/en/evaluation-tools/nucleo-l073rz.html
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set WORKAREASIZE 0x2000
diff --git a/tcl/board/st_nucleo_l1.cfg b/tcl/board/st_nucleo_l1.cfg
index 50688d2b6..d7474d0fe 100644
--- a/tcl/board/st_nucleo_l1.cfg
+++ b/tcl/board/st_nucleo_l1.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32l1x_dual_bank.cfg]
diff --git a/tcl/board/st_nucleo_l4.cfg b/tcl/board/st_nucleo_l4.cfg
index 8c63d8cbf..b0a75afe0 100644
--- a/tcl/board/st_nucleo_l4.cfg
+++ b/tcl/board/st_nucleo_l4.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32l4x.cfg]
diff --git a/tcl/board/st_nucleo_l5.cfg b/tcl/board/st_nucleo_l5.cfg
index 6450f08b8..626914aa7 100644
--- a/tcl/board/st_nucleo_l5.cfg
+++ b/tcl/board/st_nucleo_l5.cfg
@@ -3,7 +3,7 @@
# This is for STM32L5 Nucleo Dev Boards.
# http://www.st.com/en/evaluation-tools/stm32-mcu-nucleo.html
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
transport select dapdirect_swd
diff --git a/tcl/board/st_nucleo_wb55.cfg b/tcl/board/st_nucleo_wb55.cfg
index 29b7ec98d..ab7307c68 100644
--- a/tcl/board/st_nucleo_wb55.cfg
+++ b/tcl/board/st_nucleo_wb55.cfg
@@ -6,7 +6,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32wbx.cfg]
diff --git a/tcl/board/stm320518_eval_stlink.cfg b/tcl/board/stm320518_eval_stlink.cfg
index 153f7e5cb..997bb4af9 100644
--- a/tcl/board/stm320518_eval_stlink.cfg
+++ b/tcl/board/stm320518_eval_stlink.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 8KB
set WORKAREASIZE 0x2000
diff --git a/tcl/board/stm3220g_eval_stlink.cfg b/tcl/board/stm3220g_eval_stlink.cfg
index d5296720c..4233d04f1 100644
--- a/tcl/board/stm3220g_eval_stlink.cfg
+++ b/tcl/board/stm3220g_eval_stlink.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm3241g_eval_stlink.cfg b/tcl/board/stm3241g_eval_stlink.cfg
index d2d579077..3bccd2866 100644
--- a/tcl/board/stm3241g_eval_stlink.cfg
+++ b/tcl/board/stm3241g_eval_stlink.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32429i_eval_stlink.cfg b/tcl/board/stm32429i_eval_stlink.cfg
index be3c48226..7d04aa7f3 100644
--- a/tcl/board/stm32429i_eval_stlink.cfg
+++ b/tcl/board/stm32429i_eval_stlink.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32439i_eval_stlink.cfg b/tcl/board/stm32439i_eval_stlink.cfg
index 7a1a396fc..b9ea084df 100644
--- a/tcl/board/stm32439i_eval_stlink.cfg
+++ b/tcl/board/stm32439i_eval_stlink.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f0discovery.cfg b/tcl/board/stm32f0discovery.cfg
index 60fb4a65e..398ecc103 100644
--- a/tcl/board/stm32f0discovery.cfg
+++ b/tcl/board/stm32f0discovery.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set WORKAREASIZE 0x2000
source [find target/stm32f0x.cfg]
diff --git a/tcl/board/stm32f3discovery.cfg b/tcl/board/stm32f3discovery.cfg
index f28e11f6a..73c349a6e 100644
--- a/tcl/board/stm32f3discovery.cfg
+++ b/tcl/board/stm32f3discovery.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f3x.cfg]
diff --git a/tcl/board/stm32f412g-disco.cfg b/tcl/board/stm32f412g-disco.cfg
index 757b25d75..30a9537f0 100644
--- a/tcl/board/stm32f412g-disco.cfg
+++ b/tcl/board/stm32f412g-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f413h-disco.cfg b/tcl/board/stm32f413h-disco.cfg
index 6abf49551..c82d0d434 100644
--- a/tcl/board/stm32f413h-disco.cfg
+++ b/tcl/board/stm32f413h-disco.cfg
@@ -10,7 +10,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f429disc1.cfg b/tcl/board/stm32f429disc1.cfg
index 657aa1986..0a8e7ef4e 100644
--- a/tcl/board/stm32f429disc1.cfg
+++ b/tcl/board/stm32f429disc1.cfg
@@ -7,7 +7,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32f4x.cfg]
diff --git a/tcl/board/stm32f429discovery.cfg b/tcl/board/stm32f429discovery.cfg
index d1b5f5a11..865602ab6 100644
--- a/tcl/board/stm32f429discovery.cfg
+++ b/tcl/board/stm32f429discovery.cfg
@@ -7,7 +7,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f469discovery.cfg b/tcl/board/stm32f469discovery.cfg
index cca25b7f0..c9acbbbd0 100644
--- a/tcl/board/stm32f469discovery.cfg
+++ b/tcl/board/stm32f469discovery.cfg
@@ -7,7 +7,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f469i-disco.cfg b/tcl/board/stm32f469i-disco.cfg
index 7ce57f6e7..63c42c64e 100644
--- a/tcl/board/stm32f469i-disco.cfg
+++ b/tcl/board/stm32f469i-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f4discovery.cfg b/tcl/board/stm32f4discovery.cfg
index 714f1e903..d96e2dbd3 100644
--- a/tcl/board/stm32f4discovery.cfg
+++ b/tcl/board/stm32f4discovery.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 64KB
set WORKAREASIZE 0x10000
diff --git a/tcl/board/stm32f723e-disco.cfg b/tcl/board/stm32f723e-disco.cfg
index 2dee2f902..020795620 100644
--- a/tcl/board/stm32f723e-disco.cfg
+++ b/tcl/board/stm32f723e-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 128KB
set WORKAREASIZE 0x20000
diff --git a/tcl/board/stm32f746g-disco.cfg b/tcl/board/stm32f746g-disco.cfg
index fed1d8ec9..75ff4ec1e 100644
--- a/tcl/board/stm32f746g-disco.cfg
+++ b/tcl/board/stm32f746g-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 256KB
set WORKAREASIZE 0x40000
diff --git a/tcl/board/stm32f769i-disco.cfg b/tcl/board/stm32f769i-disco.cfg
index 2969bb927..cd6383a70 100644
--- a/tcl/board/stm32f769i-disco.cfg
+++ b/tcl/board/stm32f769i-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 256KB
set WORKAREASIZE 0x40000
diff --git a/tcl/board/stm32f7discovery.cfg b/tcl/board/stm32f7discovery.cfg
index 4cc22ea62..6fd6c64b3 100644
--- a/tcl/board/stm32f7discovery.cfg
+++ b/tcl/board/stm32f7discovery.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK/V2-1
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 256KB
set WORKAREASIZE 0x40000
diff --git a/tcl/board/stm32h735g-disco.cfg b/tcl/board/stm32h735g-disco.cfg
index 4097ae28b..327a36418 100644
--- a/tcl/board/stm32h735g-disco.cfg
+++ b/tcl/board/stm32h735g-disco.cfg
@@ -7,7 +7,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set CHIPNAME stm32h735igk6
diff --git a/tcl/board/stm32h745i-disco.cfg b/tcl/board/stm32h745i-disco.cfg
index 1c0bc6748..9da1daefc 100644
--- a/tcl/board/stm32h745i-disco.cfg
+++ b/tcl/board/stm32h745i-disco.cfg
@@ -7,7 +7,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set CHIPNAME stm32h745xih6
diff --git a/tcl/board/stm32h747i-disco.cfg b/tcl/board/stm32h747i-disco.cfg
index e0a348ef0..7f8eda8c4 100644
--- a/tcl/board/stm32h747i-disco.cfg
+++ b/tcl/board/stm32h747i-disco.cfg
@@ -7,7 +7,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set CHIPNAME stm32h747xih6
diff --git a/tcl/board/stm32h750b-disco.cfg b/tcl/board/stm32h750b-disco.cfg
index efb32b1df..8b254f21f 100644
--- a/tcl/board/stm32h750b-disco.cfg
+++ b/tcl/board/stm32h750b-disco.cfg
@@ -7,7 +7,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set CHIPNAME stm32h750xbh6
diff --git a/tcl/board/stm32h7b3i-disco.cfg b/tcl/board/stm32h7b3i-disco.cfg
index 58ad9f781..df0d0a6f2 100644
--- a/tcl/board/stm32h7b3i-disco.cfg
+++ b/tcl/board/stm32h7b3i-disco.cfg
@@ -7,7 +7,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set CHIPNAME stm32h7b3lih6q
diff --git a/tcl/board/stm32h7x3i_eval.cfg b/tcl/board/stm32h7x3i_eval.cfg
index b9c4c74c2..508f10d5d 100644
--- a/tcl/board/stm32h7x3i_eval.cfg
+++ b/tcl/board/stm32h7x3i_eval.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32h7x_dual_bank.cfg]
diff --git a/tcl/board/stm32l0discovery.cfg b/tcl/board/stm32l0discovery.cfg
index c711d9c8a..59aed3405 100644
--- a/tcl/board/stm32l0discovery.cfg
+++ b/tcl/board/stm32l0discovery.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set WORKAREASIZE 0x2000
source [find target/stm32l0.cfg]
diff --git a/tcl/board/stm32l476g-disco.cfg b/tcl/board/stm32l476g-disco.cfg
index a32d20fb3..fe33ffefb 100644
--- a/tcl/board/stm32l476g-disco.cfg
+++ b/tcl/board/stm32l476g-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 96KB
set WORKAREASIZE 0x18000
diff --git a/tcl/board/stm32l496g-disco.cfg b/tcl/board/stm32l496g-disco.cfg
index 1ba2299ca..823fa6e38 100644
--- a/tcl/board/stm32l496g-disco.cfg
+++ b/tcl/board/stm32l496g-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 96KB
set WORKAREASIZE 0x18000
diff --git a/tcl/board/stm32l4discovery.cfg b/tcl/board/stm32l4discovery.cfg
index f08955078..64a456b61 100644
--- a/tcl/board/stm32l4discovery.cfg
+++ b/tcl/board/stm32l4discovery.cfg
@@ -8,7 +8,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
source [find target/stm32l4x.cfg]
diff --git a/tcl/board/stm32l4p5g-disco.cfg b/tcl/board/stm32l4p5g-disco.cfg
index 20d781a1a..33bb9a766 100644
--- a/tcl/board/stm32l4p5g-disco.cfg
+++ b/tcl/board/stm32l4p5g-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 96KB
set WORKAREASIZE 0x18000
diff --git a/tcl/board/stm32l4r9i-disco.cfg b/tcl/board/stm32l4r9i-disco.cfg
index f364ad3d5..cbb86669f 100644
--- a/tcl/board/stm32l4r9i-disco.cfg
+++ b/tcl/board/stm32l4r9i-disco.cfg
@@ -6,7 +6,7 @@
# This is for using the onboard STLINK
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
# increase working area to 96KB
set WORKAREASIZE 0x18000
diff --git a/tcl/board/stm32ldiscovery.cfg b/tcl/board/stm32ldiscovery.cfg
index d760edaba..e39b52295 100644
--- a/tcl/board/stm32ldiscovery.cfg
+++ b/tcl/board/stm32ldiscovery.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set WORKAREASIZE 0x4000
source [find target/stm32l1.cfg]
diff --git a/tcl/board/stm32mp13x_dk.cfg b/tcl/board/stm32mp13x_dk.cfg
index 6328ddb4c..08377ca76 100644
--- a/tcl/board/stm32mp13x_dk.cfg
+++ b/tcl/board/stm32mp13x_dk.cfg
@@ -3,7 +3,7 @@
# board MB1635x
# http://www.st.com/en/evaluation-tools/stm32mp135f-dk.html
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
transport select dapdirect_swd
diff --git a/tcl/board/stm32mp15x_dk2.cfg b/tcl/board/stm32mp15x_dk2.cfg
index 9503428d1..0e71e05ee 100644
--- a/tcl/board/stm32mp15x_dk2.cfg
+++ b/tcl/board/stm32mp15x_dk2.cfg
@@ -4,7 +4,7 @@
# http://www.st.com/en/evaluation-tools/stm32mp157a-dk1.html
# http://www.st.com/en/evaluation-tools/stm32mp157c-dk2.html
-source [find interface/stlink-dap.cfg]
+source [find interface/stlink.cfg]
transport select dapdirect_swd
diff --git a/tcl/board/stm32vldiscovery.cfg b/tcl/board/stm32vldiscovery.cfg
index 30e35b981..57852bfd4 100644
--- a/tcl/board/stm32vldiscovery.cfg
+++ b/tcl/board/stm32vldiscovery.cfg
@@ -5,7 +5,7 @@
source [find interface/stlink.cfg]
-transport select hla_swd
+transport select dapdirect_swd
set WORKAREASIZE 0x2000
source [find target/stm32f1x.cfg]
diff --git a/tcl/interface/stlink-dap.cfg b/tcl/interface/stlink-dap.cfg
index 99c81c180..009fdb7e0 100644
--- a/tcl/interface/stlink-dap.cfg
+++ b/tcl/interface/stlink-dap.cfg
@@ -1,22 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-#
-# STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
-# debugger/programmer
-#
-# This new interface driver creates a ST-Link wrapper for ARM-DAP named "dapdirect"
-# Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support "dapdirect"
-#
-# SWIM transport is natively supported
-#
+echo "WARNING: interface/stlink-dap.cfg is deprecated, please switch to interface/stlink.cfg"
+source [find interface/stlink.cfg]
-adapter driver st-link
-st-link vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754 0x0483 0x3755 0x0483 0x3757
-
-# transport select dapdirect_jtag
-# transport select dapdirect_swd
-# transport select swim
-
-# Optionally specify the serial number of usb device
-# e.g.
-# adapter serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"
diff --git a/tcl/interface/stlink.cfg b/tcl/interface/stlink-hla.cfg
similarity index 81%
copy from tcl/interface/stlink.cfg
copy to tcl/interface/stlink-hla.cfg
index 9b7f1f9eb..5c4adb897 100644
--- a/tcl/interface/stlink.cfg
+++ b/tcl/interface/stlink-hla.cfg
@@ -5,6 +5,9 @@
# debugger/programmer
#
+echo "DEPRECATED: OpenOCD support for ST-Link HLA transport will be dropped soon!"
+echo "Consider updating your ST-Link firmware to a version >= V2J24 (2015)"
+
adapter driver hla
hla layout stlink
hla device_desc "ST-LINK"
diff --git a/tcl/interface/stlink.cfg b/tcl/interface/stlink.cfg
index 9b7f1f9eb..99c81c180 100644
--- a/tcl/interface/stlink.cfg
+++ b/tcl/interface/stlink.cfg
@@ -4,15 +4,19 @@
# STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
# debugger/programmer
#
+# This new interface driver creates a ST-Link wrapper for ARM-DAP named "dapdirect"
+# Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support "dapdirect"
+#
+# SWIM transport is natively supported
+#
+
+adapter driver st-link
+st-link vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754 0x0483 0x3755 0x0483 0x3757
-adapter driver hla
-hla layout stlink
-hla device_desc "ST-LINK"
-hla vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753 0x0483 0x3754 0x0483 0x3755 0x0483 0x3757
+# transport select dapdirect_jtag
+# transport select dapdirect_swd
+# transport select swim
-# Optionally specify the serial number of ST-LINK/V2 usb device. ST-LINK/V2
-# devices seem to have serial numbers with unreadable characters. ST-LINK/V2
-# firmware version >= V2.J21.S4 recommended to avoid issues with adapter serial
-# number reset issues.
-# eg.
+# Optionally specify the serial number of usb device
+# e.g.
# adapter serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"
-----------------------------------------------------------------------
Summary of changes:
doc/openocd.texi | 20 +++++++-------------
tcl/board/st_b-l475e-iot01a.cfg | 2 +-
tcl/board/st_nucleo_8l152r8.cfg | 2 +-
tcl/board/st_nucleo_8s208rb.cfg | 2 +-
tcl/board/st_nucleo_f0.cfg | 2 +-
tcl/board/st_nucleo_f103rb.cfg | 2 +-
tcl/board/st_nucleo_f3.cfg | 2 +-
tcl/board/st_nucleo_f4.cfg | 2 +-
tcl/board/st_nucleo_f7.cfg | 2 +-
tcl/board/st_nucleo_g0.cfg | 2 +-
tcl/board/st_nucleo_g4.cfg | 2 +-
tcl/board/st_nucleo_h743zi.cfg | 2 +-
tcl/board/st_nucleo_h745zi.cfg | 2 +-
tcl/board/st_nucleo_l073rz.cfg | 2 +-
tcl/board/st_nucleo_l1.cfg | 2 +-
tcl/board/st_nucleo_l4.cfg | 2 +-
tcl/board/st_nucleo_l5.cfg | 2 +-
tcl/board/st_nucleo_wb55.cfg | 2 +-
tcl/board/stm320518_eval_stlink.cfg | 2 +-
tcl/board/stm3220g_eval_stlink.cfg | 2 +-
tcl/board/stm3241g_eval_stlink.cfg | 2 +-
tcl/board/stm32429i_eval_stlink.cfg | 2 +-
tcl/board/stm32439i_eval_stlink.cfg | 2 +-
tcl/board/stm32f0discovery.cfg | 2 +-
tcl/board/stm32f3discovery.cfg | 2 +-
tcl/board/stm32f412g-disco.cfg | 2 +-
tcl/board/stm32f413h-disco.cfg | 2 +-
tcl/board/stm32f429disc1.cfg | 2 +-
tcl/board/stm32f429discovery.cfg | 2 +-
tcl/board/stm32f469discovery.cfg | 2 +-
tcl/board/stm32f469i-disco.cfg | 2 +-
tcl/board/stm32f4discovery.cfg | 2 +-
tcl/board/stm32f723e-disco.cfg | 2 +-
tcl/board/stm32f746g-disco.cfg | 2 +-
tcl/board/stm32f769i-disco.cfg | 2 +-
tcl/board/stm32f7discovery.cfg | 2 +-
tcl/board/stm32h735g-disco.cfg | 2 +-
tcl/board/stm32h745i-disco.cfg | 2 +-
tcl/board/stm32h747i-disco.cfg | 2 +-
tcl/board/stm32h750b-disco.cfg | 2 +-
tcl/board/stm32h7b3i-disco.cfg | 2 +-
tcl/board/stm32h7x3i_eval.cfg | 2 +-
tcl/board/stm32l0discovery.cfg | 2 +-
tcl/board/stm32l476g-disco.cfg | 2 +-
tcl/board/stm32l496g-disco.cfg | 2 +-
tcl/board/stm32l4discovery.cfg | 2 +-
tcl/board/stm32l4p5g-disco.cfg | 2 +-
tcl/board/stm32l4r9i-disco.cfg | 2 +-
tcl/board/stm32ldiscovery.cfg | 2 +-
tcl/board/stm32mp13x_dk.cfg | 2 +-
tcl/board/stm32mp15x_dk2.cfg | 2 +-
tcl/board/stm32vldiscovery.cfg | 2 +-
tcl/interface/stlink-dap.cfg | 21 ++-------------------
tcl/interface/{stlink.cfg => stlink-hla.cfg} | 3 +++
tcl/interface/stlink.cfg | 22 +++++++++++++---------
55 files changed, 76 insertions(+), 92 deletions(-)
copy tcl/interface/{stlink.cfg => stlink-hla.cfg} (81%)
hooks/post-receive
--
Main OpenOCD repository
|
