Cortex-A8: support "reset-assert" event

Use the new "reset-assert" event; else SRST; else fail.
Tested on an OMAP3, using the event.

NOTE:  still doesn't handle "reset halt".  For some reason
neither VCR nor PRCR seemed effective; they held the value
that was written, but VCR didn't trigger debug entry when
the reset vector fired (maybe the vector needs configuring?)
and PRCR refused to hold the chip in reset until deassert()
could force the core into debug state.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
__archive__
David Brownell 2009-11-27 18:50:26 -08:00
parent 4e56a2303b
commit e0cb27df6b
1 changed files with 28 additions and 5 deletions

View File

@ -1246,6 +1246,21 @@ static int cortex_a8_assert_reset(struct target *target)
LOG_DEBUG(" "); LOG_DEBUG(" ");
/* FIXME when halt is requested, make it work somehow... */
/* Issue some kind of warm reset. */
if (target_has_event_action(target, TARGET_EVENT_RESET_ASSERT)) {
target_handle_event(target, TARGET_EVENT_RESET_ASSERT);
} else if (jtag_get_reset_config() & RESET_HAS_SRST) {
/* REVISIT handle "pulls" cases, if there's
* hardware that needs them to work.
*/
jtag_add_reset(0, 1);
} else {
LOG_ERROR("%s: how to reset?", target_name(target));
return ERROR_FAIL;
}
/* registers are now invalid */ /* registers are now invalid */
register_cache_invalidate(armv7a->armv4_5_common.core_cache); register_cache_invalidate(armv7a->armv4_5_common.core_cache);
@ -1256,14 +1271,22 @@ static int cortex_a8_assert_reset(struct target *target)
static int cortex_a8_deassert_reset(struct target *target) static int cortex_a8_deassert_reset(struct target *target)
{ {
int retval;
LOG_DEBUG(" "); LOG_DEBUG(" ");
if (target->reset_halt) /* be certain SRST is off */
{ jtag_add_reset(0, 0);
int retval;
if ((retval = target_halt(target)) != ERROR_OK) retval = cortex_a8_poll(target);
return retval;
if (target->reset_halt) {
if (target->state != TARGET_HALTED) {
LOG_WARNING("%s: ran after reset and before halt ...",
target_name(target));
if ((retval = target_halt(target)) != ERROR_OK)
return retval;
}
} }
return ERROR_OK; return ERROR_OK;