interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stlink: support connecting under reset 

Some targets support connecting while the target's srst is asserted.
Tested on stm32 family.

Change-Id: I1197dd721a1e1cbf95ee77dfd8e1082b165b22a9
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/607
Tested-by: jenkins
This commit is contained in:
Spencer Oliver 2012-05-01 14:00:27 +01:00
parent 6637cf9229
commit d469c686d9
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/target/stm32_stlink.c
View File

@ -406,7 +406,7 @@ static int stm32_stlink_poll(struct target *target)
static int stm32_stlink_assert_reset(struct target *target) static int stm32_stlink_assert_reset(struct target *target)
{ {
int res; int res = ERROR_OK;
struct stlink_interface_s *stlink_if = target_to_stlink(target); struct stlink_interface_s *stlink_if = target_to_stlink(target);
struct armv7m_common *armv7m = target_to_armv7m(target); struct armv7m_common *armv7m = target_to_armv7m(target);
bool use_srst_fallback = true; bool use_srst_fallback = true;
@ -415,12 +415,22 @@ static int stm32_stlink_assert_reset(struct target *target)
enum reset_types jtag_reset_config = jtag_get_reset_config(); enum reset_types jtag_reset_config = jtag_get_reset_config();
bool srst_asserted = false;
if (jtag_reset_config & RESET_SRST_NO_GATING) {
jtag_add_reset(0, 1);
res = stlink_if->layout->api->assert_srst(stlink_if->fd, 0);
srst_asserted = true;
}
stlink_if->layout->api->write_debug_reg(stlink_if->fd, DCB_DHCSR, DBGKEY|C_DEBUGEN); stlink_if->layout->api->write_debug_reg(stlink_if->fd, DCB_DHCSR, DBGKEY|C_DEBUGEN);
stlink_if->layout->api->write_debug_reg(stlink_if->fd, DCB_DEMCR, VC_CORERESET); stlink_if->layout->api->write_debug_reg(stlink_if->fd, DCB_DEMCR, VC_CORERESET);
if (jtag_reset_config & RESET_HAS_SRST) { if (jtag_reset_config & RESET_HAS_SRST) {
jtag_add_reset(0, 1); if (!srst_asserted) {
res = stlink_if->layout->api->assert_srst(stlink_if->fd, 0); jtag_add_reset(0, 1);
res = stlink_if->layout->api->assert_srst(stlink_if->fd, 0);
}
if (res == ERROR_COMMAND_NOTFOUND) if (res == ERROR_COMMAND_NOTFOUND)
LOG_ERROR("Hardware srst not supported, falling back to software reset"); LOG_ERROR("Hardware srst not supported, falling back to software reset");
else if (res == ERROR_OK) { else if (res == ERROR_OK) {