aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tcl/target/is5114.cfg3
-rw-r--r--testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg3
-rw-r--r--testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg3
-rw-r--r--testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg3
-rw-r--r--testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg3
-rw-r--r--testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg3
-rw-r--r--testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg3
-rw-r--r--testing/examples/STR710Test/prj/str710_jtagkey.cfg3
-rw-r--r--testing/examples/STR912Test/prj/str912_jtagkey.cfg7
9 files changed, 10 insertions, 21 deletions
diff --git a/tcl/target/is5114.cfg b/tcl/target/is5114.cfg
index 091bfc2f..64c0c8ef 100644
--- a/tcl/target/is5114.cfg
+++ b/tcl/target/is5114.cfg
@@ -28,12 +28,9 @@ jtag_rclk 16
reset_config trst_and_srst
# Do not specify a tap id here...
-#OLD SYNTAX: jtag_device 8 0x1 0x1 0xfe
jtag newtap $_CHIPNAME unknown1 -irlen 8 -ircapture 0x01 -irmask 1
-#OLD SYNTAX: jtag_device 4 0x1 0xf 0xe
# This is the "arm946" chip.
jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x0e -irmask 0xf
-#OLD SYNTAX: jtag_device 5 0x1 0x1 0x1e
jtag newtap $_CHIPNAME unknown2 -irlen 5 -ircapture 1 -irmask 1
diff --git a/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg b/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
index 95f79183..bf760b2a 100644
--- a/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
+++ b/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
@@ -20,8 +20,7 @@ jtag_ntrst_delay 200
reset_config srst_only srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap at91 cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
diff --git a/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg b/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
index 8d9492b3..d491d7d0 100644
--- a/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
+++ b/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
@@ -18,8 +18,7 @@ jtag_speed 3
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap lpc cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
diff --git a/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg b/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
index 526cce1e..e8d30514 100644
--- a/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
+++ b/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
@@ -18,8 +18,7 @@ jtag_speed 3
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap lpc cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
diff --git a/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg b/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
index e08b84b5..4fd729e9 100644
--- a/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
+++ b/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
@@ -21,8 +21,7 @@ jtag_ntrst_delay 200
reset_config srst_only srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap sam7 cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
diff --git a/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg b/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
index 17e27164..930a1b6d 100644
--- a/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
+++ b/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
@@ -21,8 +21,7 @@ jtag_ntrst_delay 200
reset_config srst_only srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap sam7 cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
diff --git a/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg b/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
index 2bef1631..0e0cff52 100644
--- a/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
+++ b/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
@@ -18,8 +18,7 @@ jtag_speed 0
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap str7 cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
diff --git a/testing/examples/STR710Test/prj/str710_jtagkey.cfg b/testing/examples/STR710Test/prj/str710_jtagkey.cfg
index da4c2438..31240ccb 100644
--- a/testing/examples/STR710Test/prj/str710_jtagkey.cfg
+++ b/testing/examples/STR710Test/prj/str710_jtagkey.cfg
@@ -18,8 +18,7 @@ jtag_speed 0
reset_config trst_and_srst srst_pulls_trst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 4 0x1 0xf 0xe
+jtag newtap str7 cpu -irlen 4 -irmask 0xf
#target configuration
target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
diff --git a/testing/examples/STR912Test/prj/str912_jtagkey.cfg b/testing/examples/STR912Test/prj/str912_jtagkey.cfg
index 487ec04c..d4577f39 100644
--- a/testing/examples/STR912Test/prj/str912_jtagkey.cfg
+++ b/testing/examples/STR912Test/prj/str912_jtagkey.cfg
@@ -21,10 +21,9 @@ jtag_ntrst_delay 100
reset_config trst_and_srst
#jtag scan chain
-#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
-jtag_device 8 0x1 0x1 0xfe
-jtag_device 4 0x1 0xf 0xe
-jtag_device 5 0x1 0x1 0x1e
+jtag newtap str9 flash -irlen 8
+jtag newtap str9 cpu -irlen 4 -irmask 0xf
+jtag newtap str9 bs -irlen 5
#target configuration
target create target0 arm966e -endian little -chain-position 1 -variant arm966e