cortex_a: Fix target entry state route. 54/954/2
authorEvan Hunter <ehunter@broadcom.com>
Fri, 2 Nov 2012 06:59:03 +0000 (17:59 +1100)
committerFreddie Chopin <freddie.chopin@gmail.com>
Sun, 9 Dec 2012 21:30:18 +0000 (21:30 +0000)
If target is disabled at init, then is examined using 'arp_examine', it
can get to cortex_a8_poll with the target state being unknown.

Change-Id: Ifffb345bf971d275d2eb1912648b29f0a75f6ccc
Signed-off-by: Evan Hunter <ehunter@broadcom.com>
Reviewed-on: http://openocd.zylin.com/954
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/target/cortex_a.c

index e1c4c9c..ee1559d 100644 (file)
@@ -812,6 +812,7 @@ static int cortex_a8_poll(struct target *target)
                        LOG_DEBUG("Target halted");
                        target->state = TARGET_HALTED;
                        if ((prev_target_state == TARGET_RUNNING)
+                               || (prev_target_state == TARGET_UNKNOWN)
                                || (prev_target_state == TARGET_RESET)) {
                                retval = cortex_a8_debug_entry(target);
                                if (retval != ERROR_OK)