aboutsummaryrefslogtreecommitdiff
path: root/src/cortexm.c
diff options
context:
space:
mode:
authorNicolas Schodet2015-07-21 16:40:24 +0200
committerNicolas Schodet2015-07-21 16:40:24 +0200
commitb8f242a9fd1c6115e63f97fc6ed7e49ef99fac72 (patch)
tree239ee27496f6214b03dd7045bea43e699b046d7f /src/cortexm.c
parent4d16ac64d53c78775069e5da706b32fbe44a3085 (diff)
parent762e54060ff6004f60eab175378c6f0f6e138418 (diff)
Merge remote-tracking branch 'github/master' into dev2
Diffstat (limited to 'src/cortexm.c')
-rw-r--r--src/cortexm.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/cortexm.c b/src/cortexm.c
index ae1c59d..028af21 100644
--- a/src/cortexm.c
+++ b/src/cortexm.c
@@ -195,14 +195,6 @@ static const char tdesc_cortex_mf[] =
" </feature>"
"</target>";
-#define REG_SP 13
-#define REG_LR 14
-#define REG_PC 15
-#define REG_XPSR 16
-#define REG_MSP 17
-#define REG_PSP 18
-#define REG_SPECIAL 19
-
bool cortexm_probe(target *t)
{
t->driver = cortexm_driver_str;
@@ -426,8 +418,10 @@ static void cortexm_pc_write(target *t, const uint32_t val)
* using the core debug registers in the NVIC. */
static void cortexm_reset(target *t)
{
- jtagtap_srst(true);
- jtagtap_srst(false);
+ if ((t->target_options & CORTEXM_TOPT_INHIBIT_SRST) == 0) {
+ jtagtap_srst(true);
+ jtagtap_srst(false);
+ }
/* Read DHCSR here to clear S_RESET_ST bit before reset */
target_mem_read32(t, CORTEXM_DHCSR);