X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelper%2Fstartup.tcl;h=229aa066f23026a81414ff678b2edc6bca73e204;hb=4119cd6db2de637b07a208fdbac217b1554f85fc;hp=9fb537dc1037d464010b5e084d958366fd9c2663;hpb=fc889f035760a419f1800bbb82bc03a1a5a68827;p=openocd.git diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index 9fb537dc10..229aa066f2 100644 --- a/src/helper/startup.tcl +++ b/src/helper/startup.tcl @@ -24,16 +24,16 @@ proc get_help_text {} { # Show flash in human readable form # This is an example of a human readable form of a low level fn -proc flash_banks {} { - set i 0 +proc flash_banks {} { + set i 0 set result "" foreach {a} [ocd_flash_banks] { if {$i > 0} { set result "$result\n" } set result [format "$result#%d: %s at 0x%08x, size 0x%08x, buswidth %d, chipwidth %d" $i $a(name) $a(base) $a(size) $a(bus_width) $a(chip_width)] - set i [expr $i+1] - } + set i [expr $i+1] + } return $result } @@ -56,7 +56,7 @@ proc help {args} { set n 0 while 1 { if {$n > [string length $h]} {break} - + set next_a [expr $n+$w] if {[string length $h]>$n+$w} { set xxxx [string range $h $n [expr $n+$w]] @@ -67,8 +67,8 @@ proc help {args} { set next_a [expr $lastpos+$n+1] } } - - + + puts [format "%-25s %s" $cmdname [string range $h $n [expr $next_a-1]] ] set cmdname "" set n [expr $next_a] @@ -128,22 +128,36 @@ add_help_text script " - filename of OpenOCD script (tcl) to run" # Handle GDB 'R' packet. Can be overriden by configuration script, # but it's not something one would expect target scripts to do # normally -proc ocd_gdb_restart {target_num} { +proc ocd_gdb_restart {target_id} { # Fix!!! we're resetting all targets here! Really we should reset only # one target reset halt } -# If RCLK is not supported, use fallback_speed_khz -proc jtag_rclk {fallback_speed_khz} { - if {[catch {jtag_khz 0}]!=0} { - jtag_khz $fallback_speed_khz +global in_process_reset +set in_process_reset 0 + +# Catch reset recursion +proc ocd_process_reset { MODE } { + global in_process_reset + if {$in_process_reset} { + set in_process_reset 0 + return -code error "'reset' can not be invoked recursively" } -} -add_help_text jtag_rclk "fallback_speed_khz - set JTAG speed to RCLK or use fallback speed" + set in_process_reset 1 + set success [expr [catch {ocd_process_reset_inner $MODE} result]==0] + set in_process_reset 0 -proc ocd_process_reset { MODE } { + if {$success} { + return $result + } else { + return -code error $result + } +} + +proc ocd_process_reset_inner { MODE } { + set targets [target names] # If this target must be halted... set halt -1 @@ -162,47 +176,66 @@ proc ocd_process_reset { MODE } { # Target event handlers *might* change which TAPs are enabled # or disabled, so we fire all of them. But don't issue any - # of the "arp_*" commands, which may issue JTAG transactions, + # target "arp_*" commands, which may issue JTAG transactions, # unless we know the underlying TAP is active. + # + # NOTE: ARP == "Advanced Reset Process" ... "advanced" is + # relative to a previous restrictive scheme - foreach t [ target names ] { + foreach t $targets { # New event script. $t invoke-event reset-start } - # Init the tap controller. + # Use TRST or TMS/TCK operations to reset all the tap controllers. + # TAP reset events get reported; they might enable some taps. + # + # REVISIT arp_init-reset pulses SRST (if it can) with TRST active; + # but SRST events aren't reported (unlike "jtag arp_reset", below) jtag arp_init-reset # Examine all targets on enabled taps. - foreach t [ target names ] { + foreach t $targets { if {[jtag tapisenabled [$t cget -chain-position]]} { $t arp_examine } } - # Let the C code know we are asserting reset. - foreach t [ target names ] { + # Assert SRST, and report the pre/post events. + # Note: no target sees SRST before "pre" or after "post". + foreach t $targets { $t invoke-event reset-assert-pre + } + foreach t $targets { # C code needs to know if we expect to 'halt' if {[jtag tapisenabled [$t cget -chain-position]]} { $t arp_reset assert $halt } + } + foreach t $targets { $t invoke-event reset-assert-post } - # Now de-assert reset. - foreach t [ target names ] { + # Now de-assert SRST, and report the pre/post events. + # Note: no target sees !SRST before "pre" or after "post". + foreach t $targets { $t invoke-event reset-deassert-pre - # Again, de-assert code needs to know.. + } + foreach t $targets { + # Again, de-assert code needs to know if we 'halt' if {[jtag tapisenabled [$t cget -chain-position]]} { $t arp_reset deassert $halt } + } + foreach t $targets { $t invoke-event reset-deassert-post } - # Pass 1 - Now try to halt. + # Pass 1 - Now wait for any halt (requested as part of reset + # assert/deassert) to happen. Ideally it takes effect without + # first executing any instructions. if { $halt } { - foreach t [target names] { + foreach t $targets { if {[jtag tapisenabled [$t cget -chain-position]] == 0} { continue } @@ -211,13 +244,13 @@ proc ocd_process_reset { MODE } { # the JTAG tap reset signal might be hooked to a slow # resistor/capacitor circuit - and it might take a while # to charge - + # Catch, but ignore any errors. catch { $t arp_waitstate halted 1000 } - + # Did we succeed? set s [$t curstate] - + if { 0 != [string compare $s "halted" ] } { return -error [format "TARGET: %s - Not halted" $t] } @@ -226,7 +259,7 @@ proc ocd_process_reset { MODE } { #Pass 2 - if needed "init" if { 0 == [string compare init $MODE] } { - foreach t [target names] { + foreach t $targets { if {[jtag tapisenabled [$t cget -chain-position]] == 0} { continue } @@ -234,12 +267,12 @@ proc ocd_process_reset { MODE } { set err [catch "$t arp_waitstate halted 5000"] # Did it halt? if { $err == 0 } { - $t invoke-event reset-init + $t invoke-event reset-init } } } - foreach t [ target names ] { + foreach t $targets { $t invoke-event reset-end } } @@ -259,20 +292,20 @@ add_help_text production " - Runs production procedure. Throws exc proc production_test {} { puts "Imagine nifty test procedure having run to completion here." } -add_help_text production "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script." +add_help_text production_test "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script." add_help_text cpu " - prints out target options and a comment on CPU which matches name" # A list of names of CPU and options required set ocd_cpu_list { { - name IXP42x - options {xscale -variant IXP42x} + name IXP42x + options {xscale -variant IXP42x} comment {IXP42x cpu} } { - name arm7 - options {arm7tdmi -variant arm7tdmi} + name arm7 + options {arm7tdmi -variant arm7tdmi} comment {vanilla ARM7} } } @@ -284,7 +317,7 @@ proc ocd_cpu {args} { global ocd_cpu_list foreach a [lsort $ocd_cpu_list] { if {[string length $args]==0||[string first [string toupper $name] [string toupper "$a(name)$a(options)$a(comment)"]]!=-1} { - lappend result $a + lappend result $a } } return $result @@ -324,5 +357,15 @@ proc capture_catch {a} { catch { capture {uplevel $a} } result - return $result + return $result } + + +# Executed during "init". Can be implemented by target script +# tar +proc jtag_init {} { + if {[catch {jtag arp_init} err]!=0} { + # try resetting additionally + jtag arp_init-reset + } +} \ No newline at end of file