more tcl/{board,target} cleanup

Remove more remnants of the old "jtag_device" syntax.

Don't [format "%s.cpu" $_CHIPNAME] ... it's needless complexity.

Remove various non-supported "-variant" target options; they're not
needed often at all.

Flag some of the board files as needing to have and use target files
for the TAP and target declarations.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2009-12-15 14:39:25 -08:00
parent 80a757d82e
commit 4a2f4e3433
12 changed files with 48 additions and 23 deletions

View File

@ -1,5 +1,9 @@
#Script for AT91EB40a #Script for AT91EB40a
# FIXME use some standard target config, maybe create one from this
#
# source [find target/...cfg]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
} else { } else {
@ -30,12 +34,11 @@ if { [info exists CPUTAPID ] } {
reset_config srst_only srst_pulls_trst reset_config srst_only srst_pulls_trst
#jtag scan chain #jtag scan chain
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
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
#target configuration #target configuration
set _TARGETNAME $_CHIPNAME.cpu set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME
# speed up memory downloads # speed up memory downloads
arm7_9 fast_memory_access enable arm7_9 fast_memory_access enable

View File

@ -5,6 +5,10 @@
# # # #
################################################################################################# #################################################################################################
# FIXME use some standard target config, maybe create one from this
#
# source [find target/...cfg]
# Define basic characteristics for the CPU. The AT91SAM9G20 processor is a subtle variant of # Define basic characteristics for the CPU. The AT91SAM9G20 processor is a subtle variant of
# the AT91SAM9260 and shares the same tap ID as it. # the AT91SAM9260 and shares the same tap ID as it.
@ -34,8 +38,8 @@ jtag_ntrst_delay 200
jtag_rclk 5 jtag_rclk 5
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME
# Establish internal SRAM memory work areas that are important to pre-bootstrap loaders, etc. The # Establish internal SRAM memory work areas that are important to pre-bootstrap loaders, etc. The
# AT91SAM9G20 has two SRAM areas, one starting at 0x00200000 and the other starting at 0x00300000. # AT91SAM9G20 has two SRAM areas, one starting at 0x00200000 and the other starting at 0x00300000.

View File

@ -4,6 +4,10 @@
reset_config trst_and_srst reset_config trst_and_srst
# FIXME use some standard target config, maybe create one from this
#
# source [find target/...cfg]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
} else { } else {
@ -29,7 +33,7 @@ if { [info exists CPUTAPID ] } {
set _CPUTAPID 0x07926031 set _CPUTAPID 0x07926031
} }
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
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
jtag_nsrst_delay 200 jtag_nsrst_delay 200
@ -40,7 +44,7 @@ jtag_ntrst_delay 0
# Target configuration # Target configuration
###################### ######################
target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME
$_TARGETNAME configure -event reset-init { $_TARGETNAME configure -event reset-init {
mww 0x90600104 0x33313333 mww 0x90600104 0x33313333

View File

@ -11,8 +11,13 @@ 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
#jtag scan chain
#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE) #
# FIXME use the standard str912 target config; that script might need
# updating to "-ignore-version" for the boundary scan TAP
#
# source [find target/str912.cfg]
#
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
@ -50,8 +55,8 @@ if { [info exists BSTAPID ] } {
} }
jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME
$_TARGETNAME configure -event reset-init { $_TARGETNAME configure -event reset-init {
# We can increase speed now that we know the target is halted. # We can increase speed now that we know the target is halted.

View File

@ -71,6 +71,11 @@
# #
# #
# #
# FIXME use some standard target config, maybe create one from this
#
# source [find target/...cfg]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# Target configuration for the Samsung 2440 system on chip # Target configuration for the Samsung 2440 system on chip
# Tested on a S3C2440 Evaluation board by keesj # Tested on a S3C2440 Evaluation board by keesj
@ -102,8 +107,8 @@ if { [info exists CPUTAPID ] } {
#jtag scan chain #jtag scan chain
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id $_CPUTAPID jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id $_CPUTAPID
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm920t target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME
$_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 1 $_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 1
#reset configuration #reset configuration

View File

@ -3,6 +3,10 @@
# Need reset scripts # Need reset scripts
reset_config trst_and_srst reset_config trst_and_srst
# FIXME use some standard target config, maybe create one from this
#
# source [find target/...cfg]
if { [info exists CHIPNAME] } { if { [info exists CHIPNAME] } {
set _CHIPNAME $CHIPNAME set _CHIPNAME $CHIPNAME
} else { } else {
@ -37,8 +41,8 @@ if { [info exists BSTAPID ] } {
} }
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 $_BSTAPID
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME
$_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 1 $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 1
$_TARGETNAME configure -event reset-init { $_TARGETNAME configure -event reset-init {

View File

@ -31,8 +31,8 @@ if { [info exists CPUTAPID ] } {
} }
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
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME
# at CPU CLK <32kHz this must be disabled # at CPU CLK <32kHz this must be disabled
arm7_9 fast_memory_access enable arm7_9 fast_memory_access enable

View File

@ -10,7 +10,7 @@ set CHIPNAME ar71xx
jtag newtap $CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id 1 jtag newtap $CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id 1
set TARGETNAME [format "%s.cpu" $CHIPNAME] set TARGETNAME $CHIPNAME.cpu
target create $TARGETNAME mips_m4k -endian big -chain-position $TARGETNAME target create $TARGETNAME mips_m4k -endian big -chain-position $TARGETNAME
$TARGETNAME configure -event reset-halt-post { $TARGETNAME configure -event reset-halt-post {

View File

@ -35,7 +35,7 @@ jtag newtap $_CHIPNAME dsp -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_D
# Per ARM: DDI0211J_arm1136_r1p5_trm.pdf - the ARM 1136 as a 5 bit IR register # Per ARM: DDI0211J_arm1136_r1p5_trm.pdf - the ARM 1136 as a 5 bit IR register
jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm11 -endian $_ENDIAN -chain-position $_TARGETNAME target create $_TARGETNAME arm11 -endian $_ENDIAN -chain-position $_TARGETNAME
# C100's ARAM 64k SRAM # C100's ARAM 64k SRAM

View File

@ -29,7 +29,7 @@ if { [info exists ETBTAPID ] } {
reset_config trst_and_srst separate reset_config trst_and_srst separate
# Define the _TARGETNAME # Define the _TARGETNAME
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
# Include the ETB tap controller if asked for. # Include the ETB tap controller if asked for.
# Has to be done manually for newer devices (not an "old" LPC2917/2919). # Has to be done manually for newer devices (not an "old" LPC2917/2919).

View File

@ -39,8 +39,8 @@ jtag_ntrst_delay 20
# Target configuration # Target configuration
###################### ######################
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME
# built-in RAM0 # built-in RAM0
#working_area 0 0xf8004000 0x4000 nobackup #working_area 0 0xf8004000 0x4000 nobackup

View File

@ -39,8 +39,8 @@ jtag_ntrst_delay 20
# Target configuration # Target configuration
###################### ######################
set _TARGETNAME [format "%s.cpu" $_CHIPNAME] set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME
# built-in RAM0 # built-in RAM0
#working_area 0 0xf8004000 0x4000 nobackup #working_area 0 0xf8004000 0x4000 nobackup