diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-03-16 22:42:29 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-03-16 22:42:29 +0000 |
| commit | 8ea1bc666da14fd5a0fb5847fa9a47bc6d5ec12e (patch) | |
| tree | 2cc1a5b09502a28545de25b85b232a5a248a6927 /src/target/cortex_m3.c | |
| parent | 90815705d7deb2101b5ca8d6c9c568de6250d0b6 (diff) | |
| download | openocd+libswd-8ea1bc666da14fd5a0fb5847fa9a47bc6d5ec12e.tar.gz openocd+libswd-8ea1bc666da14fd5a0fb5847fa9a47bc6d5ec12e.tar.bz2 openocd+libswd-8ea1bc666da14fd5a0fb5847fa9a47bc6d5ec12e.tar.xz openocd+libswd-8ea1bc666da14fd5a0fb5847fa9a47bc6d5ec12e.zip | |
- fix issue with cortex_m3 reset run. Thanks Perry Hung
- https://lists.berlios.de/pipermail/openocd-development/2009-March/005028.html
git-svn-id: svn://svn.berlios.de/openocd/trunk@1413 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/cortex_m3.c')
| -rw-r--r-- | src/target/cortex_m3.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c index a0832238..e97b2be8 100644 --- a/src/target/cortex_m3.c +++ b/src/target/cortex_m3.c @@ -243,6 +243,10 @@ int cortex_m3_endreset_event(target_t *target) swjdp_transaction_endcheck(swjdp); armv7m_invalidate_core_regs(target); + + /* make sure we have latest dhcsr flags */ + ahbap_read_system_atomic_u32(swjdp, DCB_DHCSR, &cortex_m3->dcb_dhcsr); + return ERROR_OK; } @@ -724,8 +728,12 @@ int cortex_m3_assert_reset(target_t *target) /* Set/Clear C_MASKINTS in a separate operation */ if (cortex_m3->dcb_dhcsr & C_MASKINTS) ahbap_write_system_atomic_u32(swjdp, DCB_DHCSR, DBGKEY | C_DEBUGEN | C_HALT); - + + /* clear any debug flags before resuming */ cortex_m3_clear_halt(target); + + /* clear C_HALT in dhcsr reg */ + cortex_m3_write_debug_halt_mask(target, 0, C_HALT); /* Enter debug state on reset, cf. end_reset_event() */ ahbap_write_system_u32(swjdp, DCB_DEMCR, TRCENA | VC_HARDERR | VC_BUSERR); |