Commit 08058e72 authored by oharboe's avatar oharboe
Browse files

reset cleanup. Remove obsolete events that are not needed for compatibility.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1053 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 1cf14b38
......@@ -119,17 +119,17 @@ proc target_script {target_num eventname scriptname} {
set tname [target number $target_num]
if { 0 == [string compare $eventname "reset"] } {
$tname configure -event old-post_reset "script $scriptname"
$tname configure -event reset-init "script $scriptname"
return
}
if { 0 == [string compare $eventname "post_reset"] } {
$tname configure -event old-post_reset "script $scriptname"
$tname configure -event reset-init "script $scriptname"
return
}
if { 0 == [string compare $eventname "pre_reset"] } {
$tname configure -event old-pre_reset "script $scriptname"
$tname configure -event reset-start "script $scriptname"
return
}
......@@ -212,9 +212,6 @@ proc ocd_process_reset { MODE } {
}
foreach t [ target names ] {
# For compatiblity with 'old scripts'
$t invoke-event old-pre_reset
# New event script.
$t invoke-event reset-start
}
......@@ -271,7 +268,6 @@ proc ocd_process_reset { MODE } {
set err [catch "$t arp_waitstate halted 5000"]
# Did it halt?
if { $err == 0 } {
$t invoke-event old-post_reset
$t invoke-event reset-init
}
}
......
......@@ -162,9 +162,7 @@ const char *target_strerror_safe( int err )
}
const Jim_Nvp nvp_target_event[] = {
{ .value = TARGET_EVENT_OLD_pre_reset , .name = "old-pre_reset" },
{ .value = TARGET_EVENT_OLD_gdb_program_config , .name = "old-gdb_program_config" },
{ .value = TARGET_EVENT_OLD_post_reset , .name = "old-post_reset" },
{ .value = TARGET_EVENT_OLD_pre_resume , .name = "old-pre_resume" },
......
......@@ -32,7 +32,7 @@ working_area 0 0x00000000 0x20000 nobackup
global reset_count
set reset_count 0
[new_target_name] configure -event old-post_reset {
[new_target_name] configure -event reset-init {
puts "Running reset init script for AT91EB40A"
global reset_count
# Reset script for AT91EB40a
......@@ -48,7 +48,7 @@ set reset_count 0
}
[new_target_name] configure -event old-pre_reset {
[new_target_name] configure -event reset-start {
global reset_count
set reset_count [expr $reset_count+1]
echo "Testing pre_reset $reset_count !"
......
......@@ -17,7 +17,7 @@ jtag_ntrst_delay 0
#target <type> <endianess> <reset mode> <JTAG pos> <variant>
target arm926ejs little 0 arm926ejs
[new_target_name] configure -event old-post_reset { script event/at91sam9260_reset.script }
[new_target_name] configure -event reset-init { script event/at91sam9260_reset.script }
#working area <target#> <address> <size> <backup|nobackup>
......
......@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
target arm7tdmi little 0 arm7tdmi
[new_target_name] configure -event old-post_reset { script event/eir-sam7se512_reset.script }
[new_target_name] configure -event reset-init { script event/eir-sam7se512_reset.script }
working_area 0 0x00200000 0x4000 nobackup
......
......@@ -10,7 +10,7 @@ jtag_device 4 0x1 0xf 0xe
target arm920t little 0 arm920t
[new_target_name] configure -event old-post_reset { script event/hammer_reset.script }
[new_target_name] configure -event reset-init { script event/hammer_reset.script }
# speed up memory downloads
arm7 fast_memory_access enable
......
......@@ -14,7 +14,7 @@ reset_config trst_and_srst srst_pulls_trst
jtag_device 4 0x1 0xf 0xe
target arm7tdmi little 0 arm7tdmi-s_r4
[new_target_name] configure -event old-post_reset {
[new_target_name] configure -event reset-init {
# Force target into ARM state
soft_reset_halt
#do not remap 0x0000-0x0020 to anything but the flash
......
......@@ -11,7 +11,7 @@ jtag_device 4 0x1 0x0 0xe
jtag_device 8 0x0 0x0 0x0
target arm926ejs little 1 arm926ejs
[new_target_name] configure -event old-post_reset { script event/omap5912_reset.script }
[new_target_name] configure -event reset-init { script event/omap5912_reset.script }
# omap5912 lcd frame buffer as working area
working_area 0 0x20000000 0x3e800 nobackup
......
......@@ -3,7 +3,7 @@ jtag_nsrst_delay 200
jtag_ntrst_delay 200
target xscale little 0 pxa255
[new_target_name] configure -event old-post_reset { script event/pxa255_reset.script }
[new_target_name] configure -event reset-init { script event/pxa255_reset.script }
reset_config trst_and_srst
......
......@@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
[new_target_name] configure -event old-post_reset { script event/sam7x256_reset.script }
[new_target_name] configure -event reset-init { script event/sam7x256_reset.script }
working_area 0 0x00200000 0x4000 nobackup
......
......@@ -12,8 +12,8 @@ jtag_device 4 0x1 0xf 0xe
#target <type> <startup mode>
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
[new_target_name] configure -event old-pre_reset { jtag_khz 10 }
[new_target_name] configure -event old-post_reset { jtag_khz 6000 }
[new_target_name] configure -event reset-start { jtag_khz 10 }
[new_target_name] configure -event reset-init { jtag_khz 6000 }
[new_target_name] configure -event old-gdb_program_config { script event/str710_program.script }
......
......@@ -17,8 +17,8 @@ jtag_nsrst_delay 500
jtag_ntrst_delay 500
target arm7tdmi little 0 arm7tdmi
[new_target_name] configure -event old-pre_reset { jtag_khz 10 }
[new_target_name] configure -event old-post_reset { jtag_khz 3000 }
[new_target_name] configure -event reset-start { jtag_khz 10 }
[new_target_name] configure -event reset-init { jtag_khz 3000 }
[new_target_name] configure -event old-gdb_program_config { script event/str730_program.script }
working_area 0 0x40000000 0x4000 nobackup
......
......@@ -20,8 +20,8 @@ jtag_ntrst_delay 500
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm7tdmi little 0 arm7tdmi
[new_target_name] configure -event old-pre_reset { jtag_khz 10 }
[new_target_name] configure -event old-post_reset { jtag_khz 3000 }
[new_target_name] configure -event reset-start { jtag_khz 10 }
[new_target_name] configure -event reset-init { jtag_khz 3000 }
[new_target_name] configure -event old-gdb_program_config { script event/str750_program.script }
working_area 0 0x40000000 0x4000 nobackup
......
......@@ -21,9 +21,9 @@ jtag_device 5 0x1 0x1 0x1e
#target arm7tdmi <reset mode> <chainpos> <endianness> <variant>
target arm966e little 1 arm966e
[new_target_name] configure -event old-pre_reset { jtag_rclk 16 }
[new_target_name] configure -event reset-start { jtag_rclk 16 }
[new_target_name] configure -event old-post_reset {
[new_target_name] configure -event reset-init {
# We can increase speed now that we know the target is halted.
jtag_rclk 3000
......
......@@ -17,7 +17,7 @@ jtag_ntrst_delay 0
#target <type> <endianess> <reset mode> <JTAG pos> <variant>
target arm926ejs big 0 arm926ejs
[new_target_name] configure -event old-post_reset { script event/wi-9c_reset.script }
[new_target_name] configure -event reset-init { script event/wi-9c_reset.script }
#working area <target#> <address> <size> <backup|nobackup>
......
......@@ -10,7 +10,7 @@ jtag_ntrst_delay 100
jtag_device 7 0x1 0x7f 0x7e
target xscale big 0 ixp42x
[new_target_name] configure -event old-post_reset { script event/xba_revA3.script }
[new_target_name] configure -event reset-init { script event/xba_revA3.script }
flash bank cfi 0x50000000 0x400000 2 2 0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment