From: David B. <dbr...@us...> - 2009-12-15 23:46:22
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 4a2f4e34336dbb662a308e5a881edbba9f3657ec (commit) via 80a757d82eafb36ffd54414f33ce91302f4522da (commit) via fc99287b097e719a6dbe8d139e71c5ed136e48e8 (commit) from 646ce814b4fb678b7d8d341afe0694c266112426 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4a2f4e34336dbb662a308e5a881edbba9f3657ec Author: David Brownell <dbr...@us...> Date: Tue Dec 15 14:39:25 2009 -0800 more tcl/{board,target} cleanup Remove more remnants of the old "jtag_device" syntax. Don't [format "%s.cpu" $_CHIPNAME] ... it's needless complexity. Remove various non-supported "-variant" target options; they're not needed often at all. Flag some of the board files as needing to have and use target files for the TAP and target declarations. Signed-off-by: David Brownell <dbr...@us...> diff --git a/tcl/board/at91eb40a.cfg b/tcl/board/at91eb40a.cfg index 62d3c9c..40f2e12 100644 --- a/tcl/board/at91eb40a.cfg +++ b/tcl/board/at91eb40a.cfg @@ -1,5 +1,9 @@ #Script for AT91EB40a +# FIXME use some standard target config, maybe create one from this +# +# source [find target/...cfg] + if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME } else { @@ -30,12 +34,11 @@ if { [info exists CPUTAPID ] } { 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 #target configuration set _TARGETNAME $_CHIPNAME.cpu -target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm7tdmi-s_r4 +target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAME # speed up memory downloads arm7_9 fast_memory_access enable diff --git a/tcl/board/at91sam9g20-ek.cfg b/tcl/board/at91sam9g20-ek.cfg index 6e8a193..b0fe546 100644 --- a/tcl/board/at91sam9g20-ek.cfg +++ b/tcl/board/at91sam9g20-ek.cfg @@ -5,6 +5,10 @@ # # ################################################################################################# +# FIXME use some standard target config, maybe create one from this +# +# source [find target/...cfg] + # Define basic characteristics for the CPU. The AT91SAM9G20 processor is a subtle variant of # the AT91SAM9260 and shares the same tap ID as it. @@ -34,8 +38,8 @@ jtag_ntrst_delay 200 jtag_rclk 5 -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] -target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME # Establish internal SRAM memory work areas that are important to pre-bootstrap loaders, etc. The # AT91SAM9G20 has two SRAM areas, one starting at 0x00200000 and the other starting at 0x00300000. diff --git a/tcl/board/digi_connectcore_wi-9c.cfg b/tcl/board/digi_connectcore_wi-9c.cfg index 3bc26ad..2d82376 100644 --- a/tcl/board/digi_connectcore_wi-9c.cfg +++ b/tcl/board/digi_connectcore_wi-9c.cfg @@ -4,6 +4,10 @@ reset_config trst_and_srst +# FIXME use some standard target config, maybe create one from this +# +# source [find target/...cfg] + if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME } else { @@ -29,7 +33,7 @@ if { [info exists CPUTAPID ] } { set _CPUTAPID 0x07926031 } -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] +set _TARGETNAME $_CHIPNAME.cpu jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID jtag_nsrst_delay 200 @@ -40,7 +44,7 @@ jtag_ntrst_delay 0 # Target configuration ###################### -target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs +target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME $_TARGETNAME configure -event reset-init { mww 0x90600104 0x33313333 diff --git a/tcl/board/hitex_str9-comstick.cfg b/tcl/board/hitex_str9-comstick.cfg index 968d80e..af7527a 100644 --- a/tcl/board/hitex_str9-comstick.cfg +++ b/tcl/board/hitex_str9-comstick.cfg @@ -11,8 +11,13 @@ jtag_nsrst_delay 100 jtag_ntrst_delay 100 #use combined on interfaces or targets that can't set TRST/SRST separately reset_config trst_and_srst -#jtag scan chain -#format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE) + +# +# FIXME use the standard str912 target config; that script might need +# updating to "-ignore-version" for the boundary scan TAP +# +# source [find target/str912.cfg] +# if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME @@ -50,8 +55,8 @@ if { [info exists BSTAPID ] } { } jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] -target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME $_TARGETNAME configure -event reset-init { # We can increase speed now that we know the target is halted. diff --git a/tcl/board/mini2440.cfg b/tcl/board/mini2440.cfg index 0f7ebf8..47bebc4 100644 --- a/tcl/board/mini2440.cfg +++ b/tcl/board/mini2440.cfg @@ -71,6 +71,11 @@ # # # + +# FIXME use some standard target config, maybe create one from this +# +# source [find target/...cfg] + #------------------------------------------------------------------------- # Target configuration for the Samsung 2440 system on chip # Tested on a S3C2440 Evaluation board by keesj @@ -102,8 +107,8 @@ 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] -target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm920t +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME $_TARGETNAME configure -work-area-phys 0x40000000 -work-area-size 0x4000 -work-area-backup 1 #reset configuration diff --git a/tcl/board/str910-eval.cfg b/tcl/board/str910-eval.cfg index 0cf794a..a2772a8 100644 --- a/tcl/board/str910-eval.cfg +++ b/tcl/board/str910-eval.cfg @@ -3,6 +3,10 @@ # Need reset scripts reset_config trst_and_srst +# FIXME use some standard target config, maybe create one from this +# +# source [find target/...cfg] + if { [info exists CHIPNAME] } { set _CHIPNAME $CHIPNAME } else { @@ -37,8 +41,8 @@ if { [info exists BSTAPID ] } { } jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] -target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 1 $_TARGETNAME configure -event reset-init { diff --git a/tcl/board/zy1000.cfg b/tcl/board/zy1000.cfg index 3f526d0..8278fa4 100644 --- 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 diff --git a/tcl/target/ar71xx.cfg b/tcl/target/ar71xx.cfg index 47bab1e..2038331 100644 --- a/tcl/target/ar71xx.cfg +++ b/tcl/target/ar71xx.cfg @@ -10,7 +10,7 @@ set CHIPNAME ar71xx jtag newtap $CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id 1 -set TARGETNAME [format "%s.cpu" $CHIPNAME] +set TARGETNAME $CHIPNAME.cpu target create $TARGETNAME mips_m4k -endian big -chain-position $TARGETNAME $TARGETNAME configure -event reset-halt-post { diff --git a/tcl/target/c100.cfg b/tcl/target/c100.cfg index a0a28d8..b175f23 100644 --- a/tcl/target/c100.cfg +++ b/tcl/target/c100.cfg @@ -35,7 +35,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/lpc2900.cfg b/tcl/target/lpc2900.cfg index 2371dd7..769d39d 100644 --- a/tcl/target/lpc2900.cfg +++ b/tcl/target/lpc2900.cfg @@ -29,7 +29,7 @@ if { [info exists ETBTAPID ] } { reset_config trst_and_srst separate # Define the _TARGETNAME -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] +set _TARGETNAME $_CHIPNAME.cpu # Include the ETB tap controller if asked for. # Has to be done manually for newer devices (not an "old" LPC2917/2919). diff --git a/tcl/target/tmpa900.cfg b/tcl/target/tmpa900.cfg index 80adc65..329e03c 100644 --- a/tcl/target/tmpa900.cfg +++ b/tcl/target/tmpa900.cfg @@ -39,8 +39,8 @@ jtag_ntrst_delay 20 # Target configuration ###################### -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] -target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME # built-in RAM0 #working_area 0 0xf8004000 0x4000 nobackup diff --git a/tcl/target/tmpa910.cfg b/tcl/target/tmpa910.cfg index 4af5e4e..29d2d6e 100644 --- a/tcl/target/tmpa910.cfg +++ b/tcl/target/tmpa910.cfg @@ -39,8 +39,8 @@ jtag_ntrst_delay 20 # Target configuration ###################### -set _TARGETNAME [format "%s.cpu" $_CHIPNAME] -target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs +set _TARGETNAME $_CHIPNAME.cpu +target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME # built-in RAM0 #working_area 0 0xf8004000 0x4000 nobackup commit 80a757d82eafb36ffd54414f33ce91302f4522da Author: David Brownell <dbr...@us...> Date: Tue Dec 15 09:15:54 2009 -0800 testing/examples/.../*cfg: rm jtag_device calls That syntax has been obsolete forever and is now gone; remove a few remaining references. Shows how seldom this stuff gets used. Signed-off-by: David Brownell <dbr...@us...> diff --git a/tcl/target/is5114.cfg b/tcl/target/is5114.cfg index 091bfc2..64c0c8e 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 95f7918..bf760b2 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 8d9492b..d491d7d 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 526cce1..e8d3051 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 e08b84b..4fd729e 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 17e2716..930a1b6 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 2bef163..0e0cff5 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 da4c243..31240cc 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 487ec04..d4577f3 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 commit fc99287b097e719a6dbe8d139e71c5ed136e48e8 Author: David Brownell <dbr...@us...> Date: Mon Dec 14 20:06:21 2009 -0800 XScale: use all-ones for BYPASS, not five-ones PXA3xx has more than five bits in IR. Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/target/xscale.c b/src/target/xscale.c index 9ed9eea..4cf5aeb 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -1496,7 +1496,7 @@ static int xscale_assert_reset(struct target *target) xscale_write_dcsr(target, 1, 0); /* select BYPASS, because having DCSR selected caused problems on the PXA27x */ - xscale_jtag_set_instr(target->tap, 0x7f); + xscale_jtag_set_instr(target->tap, ~0); jtag_execute_queue(); /* assert reset */ ----------------------------------------------------------------------- Summary of changes: src/target/xscale.c | 2 +- tcl/board/at91eb40a.cfg | 7 +++++-- tcl/board/at91sam9g20-ek.cfg | 8 ++++++-- tcl/board/digi_connectcore_wi-9c.cfg | 8 ++++++-- tcl/board/hitex_str9-comstick.cfg | 13 +++++++++---- tcl/board/mini2440.cfg | 9 +++++++-- tcl/board/str910-eval.cfg | 8 ++++++-- tcl/board/zy1000.cfg | 4 ++-- tcl/target/ar71xx.cfg | 2 +- tcl/target/c100.cfg | 2 +- tcl/target/is5114.cfg | 3 --- tcl/target/lpc2900.cfg | 2 +- tcl/target/tmpa900.cfg | 4 ++-- tcl/target/tmpa910.cfg | 4 ++-- .../AT91R40008Test/prj/at91r40008_turtle.cfg | 3 +-- .../examples/LPC2148Test/prj/lpc2148_jtagkey.cfg | 3 +-- .../examples/LPC2294Test/prj/lpc2294_jtagkey.cfg | 3 +-- .../examples/SAM7S256Test/prj/sam7s256_jtagkey.cfg | 3 +-- .../examples/SAM7X256Test/prj/sam7x256_jtagkey.cfg | 3 +-- .../STR710JtagSpeed/prj/str710_jtagkey.cfg | 3 +-- testing/examples/STR710Test/prj/str710_jtagkey.cfg | 3 +-- testing/examples/STR912Test/prj/str912_jtagkey.cfg | 7 +++---- 22 files changed, 59 insertions(+), 45 deletions(-) hooks/post-receive -- Main OpenOCD repository |