- Added support for ARM926EJ-S based cores

[fw/openocd] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 732288880b65aaf9109bdf28d2cc1396afda3c23..e2e0530f7e37aee4e6ad2e2d2db6ae54c2830107 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -76,6 +76,7 @@ extern target_type_t arm720t_target;
 extern target_type_t arm9tdmi_target;
 extern target_type_t arm920t_target;
 extern target_type_t arm966e_target;
+extern target_type_t arm926ejs_target;
 
 target_type_t *target_types[] =
 {
@@ -84,6 +85,7 @@ target_type_t *target_types[] =
        &arm920t_target,
        &arm720t_target,
        &arm966e_target,
+       &arm926ejs_target,
        NULL,
 };
 
@@ -209,6 +211,8 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
        
        if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
        {
+               target_unregister_event_callback(target_init_handler, priv);
+
                script = fopen(target->reset_script, "r");
                if (!script)
                {
@@ -221,8 +225,6 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
                fclose(script);
 
                jtag_execute_queue();
-
-               target_unregister_event_callback(target_init_handler, priv);
        }
        
        return ERROR_OK;