more tcl/{board,target} cleanup

[fw/openocd] / tcl / board / zy1000.cfg

diff --git a/tcl/board/zy1000.cfg b/tcl/board/zy1000.cfg
index 3f526d068b6d5f370afbb021615b8e3231f7b807..8278fa4696e8422022177d4b1406b8a150979604 100644 (file)
--- a/tcl/board/zy1000.cfg
+++ b/tcl/board/zy1000.cfg
@@ -31,8 +31,8 @@ if { [info exists CPUTAPID ] } {
 }
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4
+set _TARGETNAME $_CHIPNAME.cpu
+target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME
 
 # at CPU CLK <32kHz this must be disabled
 arm7_9 fast_memory_access enable