ARM: "armv4_5" command prefix becomes "arm"

[fw/openocd] / src / helper / startup.tcl

diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl
index b12d02bbe8ebd84719e3872c4c49195eedd58e5c..096f03a8e870fc0c75fab86ba5972c8d4613df6e 100644 (file)
--- a/src/helper/startup.tcl
+++ b/src/helper/startup.tcl
@@ -49,7 +49,10 @@ proc help {args} {
        global ocd_helptext
        set cmd $args
        foreach a [lsort $ocd_helptext] {
-               if {[string length $cmd]==0||[string first $cmd $a]!=-1||[string first $cmd [lindex $a 1]]!=-1} {
+               if {[string length $cmd] == 0 || \
+                       [string first $cmd $a] != -1 || \
+                       [string first $cmd [lindex $a 1]] != -1} \
+               {
                        set w 50
                        set cmdname [lindex $a 0]
                        set h [lindex $a 1]
@@ -57,19 +60,24 @@ proc help {args} {
                        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]]
-                                       for {set lastpos [expr [string length $xxxx]-1]} {$lastpos>=0&&[string compare [string range $xxxx $lastpos $lastpos] " "]!=0} {set lastpos [expr $lastpos-1]} {
+                               set next_a [expr $n + $w]
+                               if {[string length $h] > $n + $w} \
+                               {
+                                       set xxxx [string range $h $n [expr $n + $w]]
+                                       for {set lastpos [expr [string length $xxxx] - 1]} \
+                                               {$lastpos >= 0 && [string compare \
+                                                       [string range $xxxx $lastpos $lastpos] " "] != 0} \
+                                               {set lastpos [expr $lastpos - 1]} \
+                                       {
                                        }
                                        #set next_a -1
-                                       if {$lastpos!=-1} {
-                                               set next_a [expr $lastpos+$n+1]
+                                       if {$lastpos != -1} {
+                                               set next_a [expr $lastpos + $n + 1]
                                        }
                                }
 
-
-                               puts [format "%-25s %s" $cmdname [string range $h $n [expr $next_a-1]] ]
+                               puts [format "%-25s %s" $cmdname \
+                                               [string range $h $n [expr $next_a-1]] ]
                                set cmdname ""
                                set n [expr $next_a]
                        }
@@ -134,6 +142,15 @@ proc ocd_gdb_restart {target_id} {
        reset halt
 }
 
+#########
+
+# Temporary migration aid.  May be removed starting in January 2011.
+proc armv4_5 params {
+       echo "DEPRECATED! use 'arm $params' not 'armv4_5 $params'"
+       arm $params
+}
+
+#########
 
 # This reset logic may be overridden by board/target/... scripts as needed
 # to provide a reset that, if possible, is close to a power-up reset.
@@ -291,59 +308,10 @@ proc ocd_process_reset_inner { MODE } {
        }
 }
 
-# stubs for targets scripts that do not have production procedure
-proc production_info {} {
-       return "Imagine an explanation here..."
-}
-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 "<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_test "Runs test procedure. Throws exception if procedure failed. Prints progress messages. Implement in target script."
-
-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}
-       }
-}
-
-# 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
-}
+#########
 
-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)]
-       }
-}
+# REVISIT power_restore, power_dropout, srst_deasserted, srst_asserted
+# are currently neither documented nor supported except on ZY1000.
 
 proc power_restore {} {
        puts "Sensed power restore."
@@ -366,6 +334,8 @@ proc srst_asserted {} {
        puts "Sensed nSRST asserted."
 }
 
+#########
+
 # catch any exceptions, capture output and return output
 proc capture_catch {a} {
        catch {