David Brownell <david-b@pacbell.net> "set _TARGETNAME ..." cleanup

git-svn-id: svn://svn.berlios.de/openocd/trunk@2665 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/tcl/target/aduc702x.cfg b/tcl/target/aduc702x.cfg
index cdbcf456c52711c0b90d7d78e1fac70368084cbd..7e62735dea4c5e7e01c039a4fb36254fb1fb8113 100644 (file)
--- a/tcl/target/aduc702x.cfg
+++ b/tcl/target/aduc702x.cfg
@@ -36,7 +36,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
 ##
 ## Target configuration
 ##
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME
 
 # allocate the entire SRAM as working area

diff --git a/tcl/target/at91eb40a.cfg b/tcl/target/at91eb40a.cfg
index 39fbe095ae417fa0113d806d5eff70fda7665f76..44f9f8e0f068e6cf806d0abe3b791ca50f8734fc 100644 (file)
--- a/tcl/target/at91eb40a.cfg
+++ b/tcl/target/at91eb40a.cfg
@@ -34,7 +34,7 @@ reset_config srst_only srst_pulls_trst
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 #target configuration
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
 
 # speed up memory downloads

diff --git a/tcl/target/at91r40008.cfg b/tcl/target/at91r40008.cfg
index f8f5d410600643da8b76c10e66bdb457e74e68b2..47542f6a5e6dd322bd325e454edae092f5a8201e 100644 (file)
--- a/tcl/target/at91r40008.cfg
+++ b/tcl/target/at91r40008.cfg
@@ -28,7 +28,8 @@ reset_config srst_only srst_pulls_trst
 #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
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi
 
 

diff --git a/tcl/target/at91sam3uXX.cfg b/tcl/target/at91sam3uXX.cfg
index 37f6b8ef25903e0d06136714cb80fbb2f56f33ce..cfcc4a4fda91dc0534bedafe1c98d009c9576d8d 100644 (file)
--- a/tcl/target/at91sam3uXX.cfg
+++ b/tcl/target/at91sam3uXX.cfg
@@ -29,7 +29,7 @@ if { [info exists 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 cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
 
 # 16K is plenty, the smallest chip has this much

diff --git a/tcl/target/at91sam7sx.cfg b/tcl/target/at91sam7sx.cfg
index 516a09c7e3987c2f3aecf16b249ffa580c790716..80186eca8024192b5cc5c6e7504698465c3e5172 100644 (file)
--- a/tcl/target/at91sam7sx.cfg
+++ b/tcl/target/at91sam7sx.cfg
@@ -21,7 +21,7 @@ if { [info exists 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
 $_TARGETNAME configure -event reset-init { 

diff --git a/tcl/target/at91sam9260.cfg b/tcl/target/at91sam9260.cfg
index 862633ac84681eee30f1cd51b61f3bc08be0428a..6fc71a316507758982edaf0802a09fee1c69dbcb 100644 (file)
--- a/tcl/target/at91sam9260.cfg
+++ b/tcl/target/at91sam9260.cfg
@@ -35,7 +35,7 @@ jtag_rclk 3
 # Target configuration
 ######################
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 
 # Internal sram1 memory

diff --git a/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg b/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
index f10a021c8de68f01f19ed48d332e4de923feae31..11173604dc10edf967650efd9b8163240f45b5ea 100644 (file)
--- a/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
+++ b/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
@@ -41,7 +41,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
 # Target configuration
 ######################
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 
 $_TARGETNAME invoke-event halted

diff --git a/tcl/target/c100.cfg b/tcl/target/c100.cfg
index ceb8de38f313bbcbf2ed8d9436f16080859da6e7..0e72b29820dc89c6794b43b7ca42e3a940c4fb2d 100644 (file)
--- a/tcl/target/c100.cfg
+++ b/tcl/target/c100.cfg
@@ -36,7 +36,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
 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
 
 # C100's ARAM 64k SRAM

diff --git a/tcl/target/cs351x.cfg b/tcl/target/cs351x.cfg
index 75d228387944ade3d3ef4f3b7948f5213c0d0dc0..18475ff58579fda74ee47682b06d47060263d13c 100644 (file)
--- a/tcl/target/cs351x.cfg
+++ b/tcl/target/cs351x.cfg
@@ -19,8 +19,9 @@ if { [info exists CPUTAPID ] } {
 jtag newtap $_CHIPNAME cpu  -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 # Create the GDB Target.
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME fa526 -endian $_ENDIAN -chain-position $_TARGETNAME -variant fa526
+
 # There is 16K of SRAM on this chip
 # FIXME: flash programming is not working by using this work area. So comment this out for now.
 #$_TARGETNAME configure -work-area-virt 0x00000000 -work-area-phys 0x00000000 -work-area-size  0x4000 -work-area-backup 1

diff --git a/tcl/target/epc9301.cfg b/tcl/target/epc9301.cfg
index 6dbb91b37ba8eff3c34bd27386a2f5783fec1501..9eea39b5c92de5a0c36f50227d081df1af3c7457 100644 (file)
--- a/tcl/target/epc9301.cfg
+++ b/tcl/target/epc9301.cfg
@@ -23,7 +23,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME -work-area-virt 0 -work-area-phys 0x80014000 -work-area-size 0x1000 -work-area-backup 1
 
 #flash configuration

diff --git a/tcl/target/feroceon.cfg b/tcl/target/feroceon.cfg
index 552831a8448e53ce915ef75c1a2a12ee59f86f9f..25d1d13335e5c7608e6178585438ef847ca919c1 100644 (file)
--- a/tcl/target/feroceon.cfg
+++ b/tcl/target/feroceon.cfg
@@ -21,7 +21,8 @@ if { [info exists 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 feroceon -endian $_ENDIAN -chain-position $_TARGETNAME
 
 reset_config trst_and_srst

diff --git a/tcl/target/imx21.cfg b/tcl/target/imx21.cfg
index 3a02cac6c87bcefe03c96cdc15edd18036d89011..6644ce551911989252f8a697b3a7aaaa11fd74ee 100644 (file)
--- a/tcl/target/imx21.cfg
+++ b/tcl/target/imx21.cfg
@@ -28,7 +28,7 @@ jtag newtap $_CHIPNAME cpu  -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_C
 
 
 # Create the GDB Target.
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 
 arm7_9 dcc_downloads enable

diff --git a/tcl/target/imx27.cfg b/tcl/target/imx27.cfg
index b4dc8a986cb56622d005f8fc41eb65523af3beb4..f12e8784e1aab65f18c51344fae5f429ca3b6240 100644 (file)
--- a/tcl/target/imx27.cfg
+++ b/tcl/target/imx27.cfg
@@ -38,7 +38,7 @@ if { [info exists CPUTAPID ] } {
 jtag newtap $_CHIPNAME cpu  -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 # Create the GDB Target.
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 $_TARGETNAME configure -work-area-virt 0xffff4c00 -work-area-phys 0xffff4c00 -work-area-size  0x8000 -work-area-backup 1
 # Internal to the chip, there is 45K of SRAM

diff --git a/tcl/target/imx31.cfg b/tcl/target/imx31.cfg
index 3fed2f820316cc2215d7a975a057a92238708670..fa7e2d21f31d21747c5ea0fde865f2d46da932d8 100644 (file)
--- a/tcl/target/imx31.cfg
+++ b/tcl/target/imx31.cfg
@@ -54,7 +54,7 @@ jtag newtap $_CHIPNAME whatchacallit -irlen 4 -ircapture 0 -irmask 0xf -expected
 # But this conflicts with Diagram 6-13, "3bits ir and drs"
 jtag newtap $_CHIPNAME smda -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_SDMATAPID
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm11 -endian $_ENDIAN -chain-position $_TARGETNAME
 
 

diff --git a/tcl/target/imx35.cfg b/tcl/target/imx35.cfg
index d254c603b1346724d162095dbdc3cd622c85c2d0..d7561657670edafca8aad7a264e071629046cd56 100644 (file)
--- a/tcl/target/imx35.cfg
+++ b/tcl/target/imx35.cfg
@@ -43,7 +43,7 @@ jtag newtap $_CHIPNAME whatchacallit -irlen 4 -ircapture 0 -irmask 0x0 -expected
 
 jtag newtap $_CHIPNAME smda -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_SDMATAPID
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm11 -endian $_ENDIAN -chain-position $_TARGETNAME
 
 proc power_restore {} { puts "Sensed power restore. No action." } 

diff --git a/tcl/target/is5114.cfg b/tcl/target/is5114.cfg
index c28298c60c2ea48c55b2a98196a1680b2a8aa8d0..be7727db202d8e350d54fae7e64e641b4e3975b8 100644 (file)
--- a/tcl/target/is5114.cfg
+++ b/tcl/target/is5114.cfg
@@ -38,7 +38,7 @@ jtag newtap $_CHIPNAME unknown2 -irlen 5 -ircapture 1 -irmask 1
 
 
 #arm946e-s and 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm966e -endian $_ENDIAN  -chain-position $_TARGETNAME  -variant arm966e
 
 $_TARGETNAME configure -event reset-start { jtag_rclk 16 }

diff --git a/tcl/target/ixp42x.cfg b/tcl/target/ixp42x.cfg
index 12ace9909c1149e5f45b37bbca97a3293403246c..fbb227bb7a0d7ac2f6a02371184bf7f0e71dfc9c 100644 (file)
--- a/tcl/target/ixp42x.cfg
+++ b/tcl/target/ixp42x.cfg
@@ -27,6 +27,6 @@ reset_config srst_only srst_pulls_trst
 
 jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -variant ixp42x
 

diff --git a/tcl/target/lpc1768.cfg b/tcl/target/lpc1768.cfg
index 59f11c5db821819f0900dda76762bd5b58efad20..7afcf71200ace951d3c72433b29dbc4609d1a62f 100644 (file)
--- a/tcl/target/lpc1768.cfg
+++ b/tcl/target/lpc1768.cfg
@@ -27,7 +27,7 @@ reset_config trst_and_srst srst_pulls_trst
 
 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 cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
 
 # LPC1768 has 32kB of SRAM on its main system bus (so-called Local On-Chip SRAM)

diff --git a/tcl/target/lpc2103.cfg b/tcl/target/lpc2103.cfg
index cccc16d73f9b6e56a3ce49fbaa8b25906c77f8ea..b3a2262febdccb8ef3add72d294a6e648bfebd98 100644 (file)
--- a/tcl/target/lpc2103.cfg
+++ b/tcl/target/lpc2103.cfg
@@ -27,8 +27,7 @@ jtag_ntrst_delay 100
 
 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
 
 # 8kB of internal SRAM

diff --git a/tcl/target/lpc2124.cfg b/tcl/target/lpc2124.cfg
index 4cdbc02cbc3e817b97188e54c7caaf06e87e676a..9430c1b04b2040ee5364b41a2838529c380bdd4c 100644 (file)
--- a/tcl/target/lpc2124.cfg
+++ b/tcl/target/lpc2124.cfg
@@ -32,7 +32,7 @@ jtag_khz 1000
 #jtag scan chain
 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
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0

diff --git a/tcl/target/lpc2129.cfg b/tcl/target/lpc2129.cfg
index b224c044321e3b81d41fe340985f74462eeefd4a..428883d3917a0ea85d75781305f95aa61ab29b73 100644 (file)
--- a/tcl/target/lpc2129.cfg
+++ b/tcl/target/lpc2129.cfg
@@ -32,7 +32,7 @@ jtag_ntrst_delay 100
 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
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0

diff --git a/tcl/target/lpc2148.cfg b/tcl/target/lpc2148.cfg
index d367a8f5750458f2a872d7298fd2d37dd375171b..0410d3665e425f45782995b8331b82331f5cb46a 100644 (file)
--- a/tcl/target/lpc2148.cfg
+++ b/tcl/target/lpc2148.cfg
@@ -32,8 +32,7 @@ reset_config trst_and_srst srst_pulls_trst
 
 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
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0

diff --git a/tcl/target/lpc2294.cfg b/tcl/target/lpc2294.cfg
index c3746c1f944ed9e6fe4133a65ce039aa07279354..d20f0d30ad7eed8def3b0e609aa770359f4d5197 100644 (file)
--- a/tcl/target/lpc2294.cfg
+++ b/tcl/target/lpc2294.cfg
@@ -26,7 +26,7 @@ reset_config trst_and_srst srst_pulls_trst
 #jtag scan chain
 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
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 0
 

diff --git a/tcl/target/lpc2378.cfg b/tcl/target/lpc2378.cfg
index 16232383e261a6ea4e3baadba8a2f8ae1f3b8810..270cd4d1d56c3cdd73c6d2d7decd6a54aed63262 100644 (file)
--- a/tcl/target/lpc2378.cfg
+++ b/tcl/target/lpc2378.cfg
@@ -27,7 +27,7 @@ reset_config trst_and_srst srst_pulls_trst
 
 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
 
 # LPC2378 has 32kB of SRAM on its main system bus (so-called Local On-Chip SRAM)

diff --git a/tcl/target/lpc2478.cfg b/tcl/target/lpc2478.cfg
index 2cd760c3987be387c6b8e9bcda496ca6481afc8f..2c8fdce33b717baca87ae8d9c1757e9624327ef9 100644 (file)
--- a/tcl/target/lpc2478.cfg
+++ b/tcl/target/lpc2478.cfg
@@ -27,7 +27,7 @@ reset_config trst_and_srst srst_pulls_trst
 
 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
 
 # LPC2478 has 64kB of SRAM on its main system bus (so-called Local On-Chip SRAM)

diff --git a/tcl/target/mega128.cfg b/tcl/target/mega128.cfg
index 964542c95658a0bdc6e5a85db431f081aa74132e..6c0ad85905236fafff0ef3226aecd3987a0c0be4 100644 (file)
--- a/tcl/target/mega128.cfg
+++ b/tcl/target/mega128.cfg
@@ -17,7 +17,7 @@ if { [info exists 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 avr -endian $_ENDIAN -chain-position $_TARGETNAME
 
 #$_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size 16384 -work-area-backup 0

diff --git a/tcl/target/netx500.cfg b/tcl/target/netx500.cfg
index c639017b93f24d3b59c9e5b9103e8fe359f68326..7dafdc0dec55118bec5ac5265b5616aaaf8d5178 100644 (file)
--- a/tcl/target/netx500.cfg
+++ b/tcl/target/netx500.cfg
@@ -29,6 +29,6 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 

diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index 139f801f78b16397e253d87b8cc76ad67316925e..009a3cd158256a095e5a1ace2419bb2e7e723bfb 100644 (file)
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -28,7 +28,7 @@ reset_config srst_only
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 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 mips_m4k -endian $_ENDIAN -chain-position $_TARGETNAME
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0xa0000000 -work-area-size 16384 -work-area-backup 0

diff --git a/tcl/target/pxa270.cfg b/tcl/target/pxa270.cfg
index 34bb60d4d6c674241a01dca415300d3a0561c09f..6f209f8992580bcda3744e02011f9cca37ad98e7 100644 (file)
--- a/tcl/target/pxa270.cfg
+++ b/tcl/target/pxa270.cfg
@@ -30,7 +30,7 @@ jtag_nsrst_delay 260
 # the rest of the needed delays are built into the openocd program
 jtag_ntrst_delay 0
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID
 
 target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -variant pxa27x

diff --git a/tcl/target/sam7se512.cfg b/tcl/target/sam7se512.cfg
index 6f0aa38c09f21756bcf701e12f6a8a9c9597130b..98e952c310438e9c97de29cca42082556d6b9e4a 100644 (file)
--- a/tcl/target/sam7se512.cfg
+++ b/tcl/target/sam7se512.cfg
@@ -29,7 +29,7 @@ reset_config srst_only srst_pulls_trst
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 # The target
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 0

diff --git a/tcl/target/sam7x256.cfg b/tcl/target/sam7x256.cfg
index 789f7dd69ca0caeb531765632002b306aeac25be..b659dd5f87238e8b3a90c68f6009c40c3c98fa2b 100644 (file)
--- a/tcl/target/sam7x256.cfg
+++ b/tcl/target/sam7x256.cfg
@@ -21,9 +21,9 @@ if { [info exists 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
+
 $_TARGETNAME configure -event reset-init { 
        # disable watchdog
        mww 0xfffffd44 0x00008000       

diff --git a/tcl/target/samsung_s3c2410.cfg b/tcl/target/samsung_s3c2410.cfg
index 3c0768bca705f451eb135278e6cf98a6e19bdbbd..6dca7efd3de98681b1c9521a37af6a39381dfc5d 100644 (file)
--- a/tcl/target/samsung_s3c2410.cfg
+++ b/tcl/target/samsung_s3c2410.cfg
@@ -25,7 +25,7 @@ reset_config trst_and_srst
 #jtag scan chain
 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 arm920t -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm920t
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x30800000 -work-area-size 0x20000 -work-area-backup 0

diff --git a/tcl/target/samsung_s3c2440.cfg b/tcl/target/samsung_s3c2440.cfg
index 12bb4085a8de4aca193555539201fbbce8b60b75..4cfa4d82a0a90b9e72a1e3e046136f2233253744 100644 (file)
--- a/tcl/target/samsung_s3c2440.cfg
+++ b/tcl/target/samsung_s3c2440.cfg
@@ -26,8 +26,9 @@ if { [info exists CPUTAPID ] } {
 #jtag scan chain
 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
+
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x200000 -work-area-size 0x4000 -work-area-backup 1
 
 #reset configuration

diff --git a/tcl/target/samsung_s3c2450.cfg b/tcl/target/samsung_s3c2450.cfg
index f7b7393031c8b93b176a7602f9ba00b2f69bf781..ec77291d47ef800f05e5b58c382ceb4129c25bbe 100644 (file)
--- a/tcl/target/samsung_s3c2450.cfg
+++ b/tcl/target/samsung_s3c2450.cfg
@@ -36,7 +36,7 @@ if { [info exists CPUTAPID ] } {
 #jtag scan chain
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0xE -irmask 0x0f -expected-id $_CPUTAPID
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
 
 # FIX!!!!! should this really use srst_pulls_trst?
@@ -46,4 +46,4 @@ target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNA
 # However, without "srst_pulls_trst", then "reset halt" produces weird
 # errors:
 # WARNING: unknown debug reason: 0x0
-reset_config trst_and_srst
\ No newline at end of file
+reset_config trst_and_srst

diff --git a/tcl/target/samsung_s3c4510.cfg b/tcl/target/samsung_s3c4510.cfg
index 65e7fd8429b3625ce34895b84280482a57f1e972..b594e32955254ca51b2188f4c815c8227f1bdf10 100644 (file)
--- a/tcl/target/samsung_s3c4510.cfg
+++ b/tcl/target/samsung_s3c4510.cfg
@@ -20,6 +20,6 @@ if { [info exists 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  
 

diff --git a/tcl/target/samsung_s3c6410.cfg b/tcl/target/samsung_s3c6410.cfg
index 4991c811eaa73ca4dfef7051ecec0d58b68e62b8..fd9031be346f2515bd3b50044e80dcf6b3b34c01 100644 (file)
--- a/tcl/target/samsung_s3c6410.cfg
+++ b/tcl/target/samsung_s3c6410.cfg
@@ -39,7 +39,7 @@ if { [info exists CPUTAPID ] } {
 jtag newtap $_CHIPNAME unknown -irlen 4 -ircapture 0x1 -irmask 0xe  -expected-id $_BSTAPID
 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 -variant arm1176
 
 jtag_nsrst_delay 500

diff --git a/tcl/target/sharp_lh79532.cfg b/tcl/target/sharp_lh79532.cfg
index a239e3c5fac24aef8ffe446354f282ee4d29f35d..c04b8167b7509ab624d843f5165587a8063dcce1 100644 (file)
--- a/tcl/target/sharp_lh79532.cfg
+++ b/tcl/target/sharp_lh79532.cfg
@@ -20,7 +20,7 @@ if { [info exists 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  
 
 

diff --git a/tcl/target/smp8634.cfg b/tcl/target/smp8634.cfg
index c1d61882207848b357c2587fa6251a9892ae746e..b6b037aa1eac73d6d0a7003f4a85febbee5f2cd8 100644 (file)
--- a/tcl/target/smp8634.cfg
+++ b/tcl/target/smp8634.cfg
@@ -28,5 +28,5 @@ reset_config trst_and_srst separate
 # format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag newtap $_CHIPNAME cpu -irlen 5  -ircapture 0x1 -irmask 0x1
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME mips_m4k -endian $_ENDIAN -variant

diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index 04cee2349ae448156f6bb18d8e79f3a6819324da..b2c63783a9dd91deec265bcc543385d19b30e942 100644 (file)
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -57,7 +57,7 @@ if { [info exists BSTAPID ] } {
 }   
 jtag newtap $_CHIPNAME bs  -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME
 
 $_TARGETNAME configure -work-area-virt 0 -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0

diff --git a/tcl/target/str710.cfg b/tcl/target/str710.cfg
index 2d9d2fc4b052dfb99ec6a40ea119d67e8f902e99..39745717d79208191bd9b5c7307f2ed494d0d213 100644 (file)
--- a/tcl/target/str710.cfg
+++ b/tcl/target/str710.cfg
@@ -26,8 +26,9 @@ reset_config trst_and_srst srst_pulls_trst
 
 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 arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi
+
 $_TARGETNAME configure -event reset-start { jtag_khz 10 }
 $_TARGETNAME configure -event reset-init { jtag_khz 6000 }
 $_TARGETNAME configure -event gdb-flash-erase-start {

diff --git a/tcl/target/str730.cfg b/tcl/target/str730.cfg
index 5d01ec71c1ad05d4ddb2c6605c13f4cb7877ce3f..53d7e1a1e4294e8175d2249061937f936c4f22f5 100644 (file)
--- a/tcl/target/str730.cfg
+++ b/tcl/target/str730.cfg
@@ -31,8 +31,9 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id $_C
 jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
+
 $_TARGETNAME configure -event reset-start { jtag_khz 10 }
 $_TARGETNAME configure -event reset-init { jtag_khz 3000 }
 $_TARGETNAME configure -event gdb-flash-erase-start {

diff --git a/tcl/target/str750.cfg b/tcl/target/str750.cfg
index 6b5e66c31a726f7e51d56bf9f9fa98a4bae7b42f..837f6b99a755404fa7ddf83985d215b294a91ced 100644 (file)
--- a/tcl/target/str750.cfg
+++ b/tcl/target/str750.cfg
@@ -33,7 +33,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id $_C
 jtag_nsrst_delay 500
 jtag_ntrst_delay 500
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
 
 $_TARGETNAME configure -event reset-start  { jtag_khz 10 }

diff --git a/tcl/target/str912.cfg b/tcl/target/str912.cfg
index 705326b5e775a0e5d7aef4437525a0353cfa3f6d..f0709eb4560c1f86d8ab2737d5ed9dd300e506d2 100644 (file)
--- a/tcl/target/str912.cfg
+++ b/tcl/target/str912.cfg
@@ -43,7 +43,7 @@ if { [info exists 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
 
 $_TARGETNAME configure -event reset-start { jtag_rclk 16 }

diff --git a/tcl/target/test_reset_syntax_error.cfg b/tcl/target/test_reset_syntax_error.cfg
index e573c1c0a46dc9b9c41b6eb0e815a0625b937ffe..f2949e14e30c07132189a7001351899d98bf71f2 100644 (file)
--- a/tcl/target/test_reset_syntax_error.cfg
+++ b/tcl/target/test_reset_syntax_error.cfg
@@ -8,7 +8,7 @@ set _CHIPNAME syntaxtest
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf 
 
 #target configuration
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
 
 $_TARGETNAME configure -event reset-init { 

diff --git a/tcl/target/xba_revA3.cfg b/tcl/target/xba_revA3.cfg
index 007cb9e1d712af675715bcc304794035df22f9de..202ed6082cf09d5437e6303f559db3d983b0053e 100644 (file)
--- a/tcl/target/xba_revA3.cfg
+++ b/tcl/target/xba_revA3.cfg
@@ -28,8 +28,9 @@ jtag_ntrst_delay 100
 #jtag scan chain
 jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -variant ixp42x
+
 $_TARGETNAME configure -event reset-init {
        #############################################################################
        # setup expansion bus CS, disable external wdt