David Brownell <david-b@pacbell.net>:

[fw/openocd] / tcl / target / str912.cfg

diff --git a/tcl/target/str912.cfg b/tcl/target/str912.cfg
index 705326b5e775a0e5d7aef4437525a0353cfa3f6d..776a8e6d35987bf3b9e7ac994c787e89f9891b7e 100644 (file)
--- a/tcl/target/str912.cfg
+++ b/tcl/target/str912.cfg
@@ -1,4 +1,6 @@
 # script for str9
+# For more information about the configuration files, take a look at:
+# openocd.texi
 
 if { [info exists CHIPNAME] } {        
    set  _CHIPNAME $CHIPNAME    
@@ -19,52 +21,74 @@ jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
 #use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst
+#reset_config trst_and_srst
 
 if { [info exists FLASHTAPID ] } {
    set _FLASHTAPID $FLASHTAPID
 } else {
    set _FLASHTAPID 0x04570041
 }
-jtag newtap $_CHIPNAME flash -irlen 8 -ircapture 0x1 -irmask 0x1 -expected-id $_FLASHTAPID
+jtag newtap $_CHIPNAME flash \
+       -irlen 8 -ircapture 0x1 -irmask 0x1 \
+       -expected-id $_FLASHTAPID
 
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
    set _CPUTAPID 0x25966041
 }
-jtag newtap $_CHIPNAME cpu   -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+jtag newtap $_CHIPNAME cpu \
+       -irlen 4 -ircapture 0x1 -irmask 0xf \
+       -expected-id $_CPUTAPID
 
 
 if { [info exists BSTAPID ] } {
-   set _BSTAPID $BSTAPID
+   set _BSTAPID1 $BSTAPID
+   set _BSTAPID2 $BSTAPID
 } else {
-   set _BSTAPID 0x1457f041
+   set _BSTAPID1 0x1457f041
+   set _BSTAPID2 0x2457f041
 }
-jtag newtap $_CHIPNAME bs    -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID
+jtag newtap $_CHIPNAME bs \
+       -irlen 5 -ircapture 0x1 -irmask 0x1 \
+       -expected-id $_BSTAPID1 -expected-id $_BSTAPID2
 
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e
+target create $_TARGETNAME arm966e \
+       -endian $_ENDIAN \
+       -chain-position $_TARGETNAME \
+       -variant arm966e
 
 $_TARGETNAME configure -event reset-start { jtag_rclk 16 }
 
-$_TARGETNAME configure -event reset-init {
-       # We can increase speed now that we know the target is halted.
-       #jtag_rclk 3000
-       
-       # -- Enable 96K RAM
-       # PFQBC enabled / DTCM & AHB wait-states disabled
-       mww 0x5C002034 0x0191 
+proc str9x_config { } {
+       # -- Enable 96K RAM w/:
+       #    PFQBC enabled / DTCM & AHB wait-states disabled
+       mww 0x5C002034 0x0191
+       #    PFQBC disabled / DTCM & AHB wait-states enabled
+       #mww 0x5C002034 0x0196
+
+       # 256K/32k
+       str9x flash_config 0 3 2 0 0x40000
+       # 512K/32K 
+       #str9x flash_config 0 4 2 0 0x80000
+}
 
-       str9x flash_config 0 4 2 0 0x80000
-       flash protect 0 0 7 off
+proc str9x_init { } {
+       # enable RTCK
+       jtag_rclk 0
+       str9x_config
 }
 
-$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 0
+$_TARGETNAME configure -event reset-init str9x_init
+
+$_TARGETNAME configure \
+       -work-area-virt 0 \
+       -work-area-phys 0x50000000 \
+       -work-area-size 16384 \
+       -work-area-backup 0
 
 #flash bank str9x <base> <size> 0 0 <target#> <variant>
-flash bank str9x 0x00000000 0x00080000 0 0 0
-flash bank str9x 0x00080000 0x00008000 0 0 0
+flash bank str9x 0x00000000 0x00040000 0 0 0
+flash bank str9x 0x00040000 0x00008000 0 0 0
 
-# For more information about the configuration files, take a look at:
-# openocd.texi