target: Remove "-variant" argument

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

diff --git a/tcl/board/at91cap7a-stk-sdram.cfg b/tcl/board/at91cap7a-stk-sdram.cfg
index 6a7e22b278f6ac116368546b79a33f9f9f4c0a3e..9bc02e8c0383bd563d1cda73202112c6dbf7bc2c 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,15 +24,15 @@ 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_khz 32
 }
 
 proc peek32 {address} {
-       ocd_mem2array t 32 $address 1
+       mem2array t 32 $address 1
        return $t(0)
 }
 
@@ -76,6 +76,10 @@ $_TARGETNAME configure -event reset-init {
        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_khz $post_reset_khz
+       
        echo "Configuring the SDRAM controller..."
 
        # Configure EBI Chip select for SDRAM
@@ -149,10 +153,6 @@ $_TARGETNAME configure -event reset-init {
        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
 }
 
 $_TARGETNAME configure -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 0