tcl: Adapt config files to new usb_blaster command syntax

[fw/openocd] / tcl / board / at91cap7a-stk-sdram.cfg

diff --git a/tcl/board/at91cap7a-stk-sdram.cfg b/tcl/board/at91cap7a-stk-sdram.cfg
index cca12119cb1077f42149b0b69427237e82e9e9fc..8a371e064b3115809a7159372f2ff572802b5ee4 100644 (file)
--- a/tcl/board/at91cap7a-stk-sdram.cfg
+++ b/tcl/board/at91cap7a-stk-sdram.cfg
@@ -15,7 +15,7 @@ if { [info exists ENDIAN] } {
    set  _ENDIAN little
 }
 
-if { [info exists CPUTAPID ] } {
+if { [info exists CPUTAPID] } {
    set _CPUTAPID $CPUTAPID
 } else {
    set _CPUTAPID 0x40700f0f
@@ -24,11 +24,11 @@ if { [info exists CPUTAPID ] } {
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi
+target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME
 
 $_TARGETNAME configure -event reset-start {
        # start off real slow when we're running off internal RC oscillator
-       jtag_khz 10
+       adapter speed 32
 }
 
 proc peek32 {address} {
@@ -38,18 +38,18 @@ proc peek32 {address} {
 
 # Wait for an expression to be true with a timeout
 proc wait_state {expression} {
-       for {set i 0} {$i < 1000} {set i [expr $i + 1]} {
+       for {set i 0} {$i < 1000} {set i [expr {$i + 1}]} {
                if {[uplevel 1 $expression] == 0} {
                        return
                }
        }
-       return -code 1 "Timed out"      
+       return -code 1 "Timed out"
 }
 
 # Use a global variable here to be able to tinker interactively with
 # post reset jtag frequency.
 global post_reset_khz
-# Danger!!!! Even 16MHz kinda works with this target, but 
+# Danger!!!! Even 16MHz kinda works with this target, but
 # it needs to be as low as 2000kHz to be stable.
 set post_reset_khz 2000
 
@@ -61,21 +61,25 @@ $_TARGETNAME configure -event reset-init {
        mww 0xfffffd08 0xa5000001
        # Enable main oscillator
        mww 0xFFFFFc20  0x00000f01
-       wait_state {expr {([peek32 0xFFFFFC68] & 0x1) == 0}}  
+       wait_state {expr {([peek32 0xFFFFFC68] & 0x1) == 0}}
 
        # Set PLLA to 96MHz
        mww 0xFFFFFc28 0x20072801
-       wait_state {expr {([peek32 0xFFFFFC68] & 0x2) == 0}}  
+       wait_state {expr {([peek32 0xFFFFFC68] & 0x2) == 0}}
 
        # Select prescaler
        mww 0xFFFFFC30 0x00000004
-       wait_state {expr {([peek32 0xFFFFFC68] & 0x8) == 0}}  
+       wait_state {expr {([peek32 0xFFFFFC68] & 0x8) == 0}}
 
        # Select master clock to 48MHz
        mww 0xFFFFFC30 0x00000006
-       wait_state {expr {([peek32 0xFFFFFC68] & 0x8) == 0}}  
+       wait_state {expr {([peek32 0xFFFFFC68] & 0x8) == 0}}
 
        echo "Master clock ok."
+
+       # Now that we're up and running, crank up speed!
+       global post_reset_khz ; adapter speed $post_reset_khz
+
        echo "Configuring the SDRAM controller..."
 
        # Configure EBI Chip select for SDRAM
@@ -91,7 +95,7 @@ $_TARGETNAME configure -event reset-init {
 
        # Configure SDRAMC CR
        mww 0xFFFFEA08 0xA63392F9
- 
+
        # NOP command
        mww 0xFFFFEA00 0x1
        mww 0x20000000 0
@@ -147,12 +151,8 @@ $_TARGETNAME configure -event reset-init {
 
        #remap internal memory at address 0x0
        mww 0xffffef00 0x3
-       
-       echo "SDRAM configuration ok."
 
-       # Now that we're up and running, crank up speed!
-       global post_reset_khz
-       jtag_khz $post_reset_khz
+       echo "SDRAM configuration ok."
 }
 
 $_TARGETNAME configure -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 0
@@ -162,4 +162,3 @@ arm7_9 fast_memory_access enable
 
 #set _FLASHNAME $_CHIPNAME.flash
 #flash bank $_FLASHNAME at91sam7 0 0 0 0 $_TARGETNAME 0 0 0 0 0 0 0 18432
-