tcl: fix remaining scripts after rework adapter commands

[fw/openocd] / tcl / board / zy1000.cfg

diff --git a/tcl/board/zy1000.cfg b/tcl/board/zy1000.cfg
index ee7afcd4cf99be0ac9db78e5444044f43b1843f3..e0d1ccf844a3f337ebfb2e5f7ee864c4bed22378 100644 (file)
--- a/tcl/board/zy1000.cfg
+++ b/tcl/board/zy1000.cfg
@@ -24,7 +24,7 @@ if { [info exists ENDIAN] } {
 
 
 #jtag scan chain
-if { [info exists CPUTAPID ] } {
+if { [info exists CPUTAPID] } {
    set _CPUTAPID $CPUTAPID
 } else {
    set _CPUTAPID 0x1f0f0f0f
@@ -63,11 +63,16 @@ $_TARGETNAME configure -event reset-init {
        mww 0x08020004 0
 }
 
+$_TARGETNAME configure -event gdb-attach {
+       # Without this gdb-attach will first time as probe will fail
+       reset init
+}
+
 # required for usable performance. Used for lots of
 # other things than flash programming.
 $_TARGETNAME configure -work-area-phys 0x00020000 -work-area-size 0x20000 -work-area-backup 0
 
-adapter_khz 16000
+adapter speed 16000
 
 
 proc production_info {} {
@@ -80,11 +85,11 @@ proc production_info {} {
 # Progress messages are output via puts
 proc production {firmwarefile serialnumber} {
        if {[string length $serialnumber]!=12} {
-               puts "Invalid serial number"
+               echo "Invalid serial number"
                return
        }
 
-       puts "Power cycling target"
+       echo "Power cycling target"
        power off
        sleep 3000
        power on
@@ -94,10 +99,10 @@ proc production {firmwarefile serialnumber} {
        verify_image $firmwarefile 0x1000000 bin
 
        # Big endian... weee!!!!
-       puts "Setting MAC number to $serialnumber"
+       echo "Setting MAC number to $serialnumber"
        flash fillw [expr 0x1030000-0x8] "0x[string range $serialnumber 2 3][string range $serialnumber 0 1]0000" 1
        flash fillw [expr 0x1030000-0x4] "0x[string range $serialnumber 10 11][string range $serialnumber 8 9][string range $serialnumber 6 7][string range $serialnumber 4 5]" 1
-       puts "Production successful"
+       echo "Production successful"
 }