return $ocd_helptext
}
-# Production command
-# FIX!!! need to figure out how to feed back relevant output
-# from e.g. "flash banks" command...
-proc board_produce {filename serialnumber} {
- openocd "reset init"
- openocd "flash write_image erase $filename [flash] bin"]]
- openocd "verify_image $filename [flash] bin"]]
- echo "Successfully ran production procedure"
-}
-
-proc board_test {} {
- echo "Production test not implemented"
-}
# Show flash in human readable form
# This is an example of a human readable form of a low level fn
# do the name mangling from "flash banks" to "flash_banks"
if {[llength $args]>=2} {
set cmd_name "[lindex $args 0]_[lindex $args 1]"
- # Fix?? add a check here if this is a command?
- # we'll strip away args until we fail anyway...
- return [eval "$cmd_name [lrange $args 2 end]"]
+ if {[catch {info body $cmd_name}]==0} {
+ # the command exists, try it...
+ return [eval "$cmd_name [lrange $args 2 end]"]
+ }
}
# This really is an unknown command.
return -code error "Unknown command: $args"
return [target number [expr [target count] - 1 ]]
}
-
-proc target_script {target_num eventname scriptname} {
-
- set tname [target number $target_num]
-
- if { 0 == [string compare $eventname "reset"] } {
- $tname configure -event reset-init "script $scriptname"
- return
- }
-
- if { 0 == [string compare $eventname "post_reset"] } {
- $tname configure -event reset-init "script $scriptname"
- return
- }
-
- if { 0 == [string compare $eventname "pre_reset"] } {
- $tname configure -event reset-start "script $scriptname"
- return
- }
-
- if { 0 == [string compare $eventname "gdb_program_config"] } {
- $tname configure -event old-gdb_program_config "script $scriptname"
- return
- }
-
- return -code error "Unknown target (old) event: $eventname (try $tname configure -event NAME)"
-
-}
-
-add_help_text target_script "DEPRECATED please see the new TARGETNAME configure -event interface"
-
# Try flipping / and \ to find file if the filename does not
# match the precise spelling
proc find {filename} {
return -error "Invalid mode: $MODE, must be one of: halt, init, or run";
}
+ # 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,
+ # unless we know the underlying TAP is active.
+
foreach t [ target names ] {
# New event script.
$t invoke-event reset-start
# Init the tap controller.
jtag arp_init-reset
- # Examine all targets.
+ # Examine all targets on enabled taps.
foreach t [ target names ] {
- $t arp_examine
+ if {[jtag tapisenabled [$t cget -chain-position]]} {
+ $t arp_examine
+ }
}
# Let the C code know we are asserting reset.
foreach t [ target names ] {
$t invoke-event reset-assert-pre
# C code needs to know if we expect to 'halt'
- $t arp_reset assert $halt
+ if {[jtag tapisenabled [$t cget -chain-position]]} {
+ $t arp_reset assert $halt
+ }
$t invoke-event reset-assert-post
}
foreach t [ target names ] {
$t invoke-event reset-deassert-pre
# Again, de-assert code needs to know..
- $t arp_reset deassert $halt
+ if {[jtag tapisenabled [$t cget -chain-position]]} {
+ $t arp_reset deassert $halt
+ }
$t invoke-event reset-deassert-post
}
# Pass 1 - Now try to halt.
if { $halt } {
foreach t [target names] {
-
+ if {[jtag tapisenabled [$t cget -chain-position]] == 0} {
+ continue
+ }
+
# Wait upto 1 second for target to halt. Why 1sec? Cause
# the JTAG tap reset signal might be hooked to a slow
# resistor/capacitor circuit - and it might take a while
#Pass 2 - if needed "init"
if { 0 == [string compare init $MODE] } {
foreach t [target names] {
+ if {[jtag tapisenabled [$t cget -chain-position]] == 0} {
+ continue
+ }
+
set err [catch "$t arp_waitstate halted 5000"]
# Did it halt?
if { $err == 0 } {
proc production_info {} {
return "Imagine an explanation here..."
}
-add_help_text production_info "Displays information on production procedure for target script"
+add_help_text production_info "Displays information on production procedure for target script. Implement this procedure in target script."
proc production {firmwarefile serialnumber} {
puts "Imagine production procedure running successfully. Programmed $firmwarefile with serial number $serialnumber"
}
-add_help_text production "Runs production procedure. Throws exception if procedure failed. Prints progress messages."
+add_help_text production "<serialnumber> - Runs production procedure. Throws exception if procedure failed. Prints progress messages. Implement this procedure in the target script."
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."
+add_help_text production "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script."
-proc load {args} {
- return [eval "load_image $args"]
+add_help_text cpu "<name> - 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}
+ comment {IXP42x cpu}
+ }
+ {
+ name arm7
+ options {arm7tdmi -variant arm7tdmi}
+ comment {vanilla ARM7}
+ }
}
-add_help_text load "synonym to load_image"
-proc verify {args} {
- return [eval "verify_image $args"]
+# Invoked from Tcl code
+proc ocd_cpu {args} {
+ set name $args
+ set result ""
+ 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
+ }
+ }
+ return $result
}
-add_help_text verify "synonym to verify_image"
+proc cpu {args} {
+ # 0123456789012345678901234567890123456789012345678901234567890123456789
+ puts "CPU Options Comment"
+ foreach a [lsort [ocd_cpu $args]] {
+ puts [format "%-20s%-40s%s" $a(name) $a(options) $a(comment)]
+ }
+}
+
+proc power_restore {} {
+ puts "Sensed power restore."
+ reset init
+}
+
+add_help_text power_restore "Overridable procedure run when power restore is detected. Runs 'reset init' by default."
+
+proc power_dropout {} {
+ puts "Sensed power dropout."
+}
+
+proc srst_deasserted {} {
+ puts "Sensed nSRST deasserted."
+ reset init
+}
+add_help_text srst_deasserted "Overridable procedure run when srst deassert is detected. Runs 'reset init' by default."
+
+proc srst_asserted {} {
+ puts "Sensed nSRST asserted."
+}
+
+# catch any exceptions, capture output and return output
+proc capture_catch {a} {
+ catch {
+ capture {uplevel $a}
+ } result
+ return $result
+}