Revert changes from r2134 that snuck into the commit. Mea culpa.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2135 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-09 01:01:13 +00:00
parent 594abeb82b
commit ec274b2707
1 changed files with 21 additions and 45 deletions

View File

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