target: Remove "-variant" argument

Remove this underutilized feature. Despite the fact that a lot of configs
specifies a arbitrary "variant", only the xscale target actually defines
any.

In the case of xscale, the use of -variant is dubious since

1) it's used as a redundant irlen specifier,
2) it carries a comment that it doesn't really need it and
3) only two xscale configs even specify it.

If there's a future target that needs a variant set, a target specific
option could be added when needed.

Change-Id: I1ba25a946f0d80872cbd96ddcc48f92695c4ae20
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/2283
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

8 files changed, 8 insertions, 8 deletions

diff --git a/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg b/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
index d72980e..3928a27 100644
--- a/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
+++ b/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg
@@ -23,7 +23,7 @@ reset_config srst_only srst_pulls_trst
 jtag newtap at91 cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x3C000 -work-area-size 0x4000 -work-area-backup false
 
 target_script 0 reset .\prj\at91r40008_reset.script
diff --git a/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg b/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
index e6b1e9e..c73765d 100644
--- a/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
+++ b/testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg
@@ -21,7 +21,7 @@ reset_config trst_and_srst srst_pulls_trst
 jtag newtap lpc cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup false
 
 #flash bank lpc2000 <base> <size> 0 0 <target#> <variant>
diff --git a/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg b/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
index 958b8a5..77537a2 100644
--- a/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
+++ b/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg
@@ -21,7 +21,7 @@ reset_config trst_and_srst srst_pulls_trst
 jtag newtap lpc cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi-s_r4
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup false
 
 #flash configuration
diff --git a/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg b/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
index 92c1e30..0447ed6 100644
--- a/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
+++ b/testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg
@@ -24,7 +24,7 @@ reset_config srst_only srst_pulls_trst
 jtag newtap sam7 cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup false
 
 target_script 0 reset .\prj\sam7s256_reset.script
diff --git a/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg b/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
index 32a5254..a2894df 100644
--- a/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
+++ b/testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg
@@ -24,7 +24,7 @@ reset_config srst_only srst_pulls_trst
 jtag newtap sam7 cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup false
 
 target_script 0 reset .\prj\sam7x256_reset.script
diff --git a/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg b/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
index f2e50dc..b8aa96f 100644
--- a/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
+++ b/testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg
@@ -21,7 +21,7 @@ reset_config trst_and_srst srst_pulls_trst
 jtag newtap str7 cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x2000C000 -work-area-size 0x4000 -work-area-backup false
 
 #flash bank str7x <base> <size> 0 0 <target#> <variant>
diff --git a/testing/examples/STR710Test/prj/str710_jtagkey.cfg b/testing/examples/STR710Test/prj/str710_jtagkey.cfg
index 14ec3f1..478c55e 100644
--- a/testing/examples/STR710Test/prj/str710_jtagkey.cfg
+++ b/testing/examples/STR710Test/prj/str710_jtagkey.cfg
@@ -21,7 +21,7 @@ reset_config trst_and_srst srst_pulls_trst
 jtag newtap str7 cpu -irlen 4 -irmask 0xf
 
 #target configuration
-target create target0 arm7tdmi -endian little -chain-position 0 -variant arm7tdmi
+target create target0 arm7tdmi -endian little -chain-position 0
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x2000C000 -work-area-size 0x4000 -work-area-backup false
 
 target_script 0 gdb_program_config .\prj\str710_program.script
diff --git a/testing/examples/STR912Test/prj/str912_jtagkey.cfg b/testing/examples/STR912Test/prj/str912_jtagkey.cfg
index 8a3f281..f379e0d 100644
--- a/testing/examples/STR912Test/prj/str912_jtagkey.cfg
+++ b/testing/examples/STR912Test/prj/str912_jtagkey.cfg
@@ -26,7 +26,7 @@ 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
+target create target0 arm966e -endian little -chain-position 1
 [new_target_name] configure -work-area-virt 0 -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup false
 
 target_script 0 gdb_program_config .\prj\str912_program.script