From 1c021ed0afb5f9f7d9e8cbce53a4fe985a4c2235 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Mon, 8 Sep 2014 22:11:02 +0200 Subject: 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 Reviewed-on: http://openocd.zylin.com/2283 Tested-by: jenkins Reviewed-by: Spencer Oliver --- testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg | 2 +- testing/examples/LPC2148Test/prj/lpc2148_jtagkey.cfg | 2 +- testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg | 2 +- testing/examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg | 2 +- testing/examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg | 2 +- testing/examples/STR710JtagSpeed/prj/str710_jtagkey.cfg | 2 +- testing/examples/STR710Test/prj/str710_jtagkey.cfg | 2 +- testing/examples/STR912Test/prj/str912_jtagkey.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'testing/examples') diff --git a/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg b/testing/examples/AT91R40008Test/prj/at91r40008_turtle.cfg index d72980e7..3928a27e 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 e6b1e9eb..c73765d9 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 0 0 diff --git a/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg b/testing/examples/LPC2294Test/prj/lpc2294_jtagkey.cfg index 958b8a56..77537a22 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 92c1e302..0447ed66 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 32a5254f..a2894df7 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 f2e50dca..b8aa96f5 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 0 0 diff --git a/testing/examples/STR710Test/prj/str710_jtagkey.cfg b/testing/examples/STR710Test/prj/str710_jtagkey.cfg index 14ec3f18..478c55e4 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 8a3f281d..f379e0d3 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 -- cgit v1.2.3-18-g5258