zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove jtag_rclk from target configs 

Some boards might have RCLK omitted from the JTAG connector and if the
interface claims support for it, OpenOCD will end up trying to use
RCLK while it's actually impossible.

This is a "cd tcl/target; sed -i s/jtag_rclk/adapter_khz/g *" patch.

Change-Id: Iee7337107bc1457966b104389ba9db75a9c860b4
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/1695
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-by: Mathias Küster <kesmtp@freenet.de>
__archive__
Paul Fertser 2013-10-13 19:15:24 +04:00 committed by Spencer Oliver
parent 2b10052097
commit d4e195ad1b
13 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tcl/target/altera_fpgasoc.cfg
View File

@ -36,7 +36,7 @@ jtag newtap $_CHIPNAME.fpga tap -irlen 10 -ircapture 0x01 -irmask 0x3 -expected-
# core 1 - 0x80112000 # core 1 - 0x80112000
# Slow speed to be sure it will work # Slow speed to be sure it will work
jtag_rclk 1000 adapter_khz 1000
set _TARGETNAME1 $_CHIPNAME.cpu.0 set _TARGETNAME1 $_CHIPNAME.cpu.0
set _TARGETNAME2 $_CHIPNAME.cpu.1 set _TARGETNAME2 $_CHIPNAME.cpu.1
@ -45,7 +45,7 @@ set _TARGETNAME2 $_CHIPNAME.cpu.1
target create $_TARGETNAME1 cortex_a -chain-position $_CHIPNAME.dap \ target create $_TARGETNAME1 cortex_a -chain-position $_CHIPNAME.dap \
-coreid 0 -dbgbase 0x80110000 -coreid 0 -dbgbase 0x80110000
$_TARGETNAME1 configure -event reset-start { jtag_rclk 1000 } $_TARGETNAME1 configure -event reset-start { adapter_khz 1000 }
$_TARGETNAME1 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME1" $_TARGETNAME1 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME1"
$_TARGETNAME1 configure -event gdb-attach { halt } $_TARGETNAME1 configure -event gdb-attach { halt }
@ -54,7 +54,7 @@ $_TARGETNAME1 configure -event gdb-attach { halt }
#target create $_TARGETNAME2 cortex_a -chain-position $_CHIPNAME.dap \ #target create $_TARGETNAME2 cortex_a -chain-position $_CHIPNAME.dap \
# -coreid 1 -dbgbase 0x80112000 # -coreid 1 -dbgbase 0x80112000
#$_TARGETNAME2 configure -event reset-start { jtag_rclk 1000 } #$_TARGETNAME2 configure -event reset-start { adapter_khz 1000 }
#$_TARGETNAME2 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME2" #$_TARGETNAME2 configure -event reset-assert-post "cycv_dbginit $_TARGETNAME2"
#$_TARGETNAME2 configure -event gdb-attach { halt } #$_TARGETNAME2 configure -event gdb-attach { halt }

2
tcl/target/at91sam9.cfg
View File

@ -27,7 +27,7 @@ jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CP
adapter_nsrst_delay 300 adapter_nsrst_delay 300
jtag_ntrst_delay 200 jtag_ntrst_delay 200
jtag_rclk 3 adapter_khz 3
###################### ######################
# Target configuration # Target configuration

6
tcl/target/at91sam9260_ext_RAM_ext_flash.cfg
View File

@ -6,7 +6,7 @@ source [find target/at91sam9261.cfg]
reset_config trst_and_srst reset_config trst_and_srst
jtag_rclk 4 adapter_khz 4
adapter_nsrst_delay 200 adapter_nsrst_delay 200
jtag_ntrst_delay 200 jtag_ntrst_delay 200
@ -14,7 +14,7 @@ jtag_ntrst_delay 200
scan_chain scan_chain
$_TARGETNAME configure -event reset-start { $_TARGETNAME configure -event reset-start {
# at reset chip runs at 32khz # at reset chip runs at 32khz
jtag_rclk 8 adapter_khz 8
} }
$_TARGETNAME configure -event reset-init {at91sam_init} $_TARGETNAME configure -event reset-init {at91sam_init}
@ -46,7 +46,7 @@ proc at91sam_init { } {
sleep 10 ;# wait 10 ms sleep 10 ;# wait 10 ms
# Now run at anything fast... ie: 10mhz! # Now run at anything fast... ie: 10mhz!
jtag_rclk 10000 ;# Increase JTAG Speed to 6 MHz adapter_khz 10000 ;# Increase JTAG Speed to 6 MHz
mww 0xffffec00 0x0a0a0a0a ;# SMC_SETUP0 : Setup SMC for Intel NOR Flash JS28F128P30T85 128MBit mww 0xffffec00 0x0a0a0a0a ;# SMC_SETUP0 : Setup SMC for Intel NOR Flash JS28F128P30T85 128MBit
mww 0xffffec04 0x0b0b0b0b ;# SMC_PULSE0 mww 0xffffec04 0x0b0b0b0b ;# SMC_PULSE0

2
tcl/target/at91sam9g20.cfg
View File

@ -12,7 +12,7 @@ source [find target/at91sam9.cfg]
# Set fallback clock to 1/6 of worst-case clock speed (which would be the 32.768 kHz slow clock). # Set fallback clock to 1/6 of worst-case clock speed (which would be the 32.768 kHz slow clock).
jtag_rclk 5 adapter_khz 5
# Establish internal SRAM memory work areas that are important to pre-bootstrap loaders, etc. The # 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. # AT91SAM9G20 has two SRAM areas, one starting at 0x00200000 and the other starting at 0x00300000.

4
tcl/target/imx6.cfg
View File

@ -51,8 +51,8 @@ proc imx6_dbginit {target} {
} }
# Slow speed to be sure it will work # Slow speed to be sure it will work
jtag_rclk 1000 adapter_khz 1000
$_TARGETNAME configure -event reset-start { jtag_rclk 1000 } $_TARGETNAME configure -event reset-start { adapter_khz 1000 }
$_TARGETNAME configure -event reset-assert-post "imx6_dbginit $_TARGETNAME" $_TARGETNAME configure -event reset-assert-post "imx6_dbginit $_TARGETNAME"
$_TARGETNAME configure -event gdb-attach { halt } $_TARGETNAME configure -event gdb-attach { halt }

6
tcl/target/is5114.cfg
View File

@ -23,7 +23,7 @@ if { [info exists CPUTAPID] } {
} }
# jtag speed. We need to stick to 16kHz until we've finished reset. # jtag speed. We need to stick to 16kHz until we've finished reset.
jtag_rclk 16 adapter_khz 16
reset_config trst_and_srst reset_config trst_and_srst
@ -38,9 +38,9 @@ jtag newtap $_CHIPNAME unknown2 -irlen 5 -ircapture 1 -irmask 1
set _TARGETNAME $_CHIPNAME.cpu set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e
$_TARGETNAME configure -event reset-start { jtag_rclk 16 } $_TARGETNAME configure -event reset-start { adapter_khz 16 }
$_TARGETNAME configure -event reset-init { $_TARGETNAME configure -event reset-init {
# We can increase speed now that we know the target is halted. # We can increase speed now that we know the target is halted.
jtag_rclk 3000 adapter_khz 3000
} }
$_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 1 $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 1

2
tcl/target/mc13224v.cfg
View File

@ -35,7 +35,7 @@ reset_config srst_only
jtag_ntrst_delay 200 jtag_ntrst_delay 200
# rclk hasn't been working well. This maybe the mc13224v or something else. # rclk hasn't been working well. This maybe the mc13224v or something else.
#jtag_rclk 2000 #adapter_khz 2000
adapter_khz 2000 adapter_khz 2000
###################### ######################

4
tcl/target/omap3530.cfg
View File

@ -62,8 +62,8 @@ proc omap3_dbginit {target} {
# be absolutely certain the JTAG clock will work with the worst-case # be absolutely certain the JTAG clock will work with the worst-case
# 16.8MHz/2 = 8.4MHz core clock, even before a bootloader kicks in. # 16.8MHz/2 = 8.4MHz core clock, even before a bootloader kicks in.
# OK to speed up *after* PLL and clock tree setup. # OK to speed up *after* PLL and clock tree setup.
jtag_rclk 1000 adapter_khz 1000
$_TARGETNAME configure -event "reset-start" { jtag_rclk 1000 } $_TARGETNAME configure -event "reset-start" { adapter_khz 1000 }
# Assume SRST is unavailable (e.g. TI-14 JTAG), so we must assert reset # Assume SRST is unavailable (e.g. TI-14 JTAG), so we must assert reset
# ourselves using PRM_RSTCTRL. RST_GS (2) is a warm reset, like ICEpick # ourselves using PRM_RSTCTRL. RST_GS (2) is a warm reset, like ICEpick

4
tcl/target/omapl138.cfg
View File

@ -52,8 +52,8 @@ $_TARGETNAME configure -work-area-phys 0x80000000 -work-area-size 0x2000
# be absolutely certain the JTAG clock will work with the worst-case # be absolutely certain the JTAG clock will work with the worst-case
# CLKIN = 20 MHz (best case: 30 MHz) even when no bootloader turns # CLKIN = 20 MHz (best case: 30 MHz) even when no bootloader turns
# on the PLL and starts using it. OK to speed up after clock setup. # on the PLL and starts using it. OK to speed up after clock setup.
jtag_rclk 1500 adapter_khz 1500
$_TARGETNAME configure -event "reset-start" { jtag_rclk 1500 } $_TARGETNAME configure -event "reset-start" { adapter_khz 1500 }
arm7_9 fast_memory_access enable arm7_9 fast_memory_access enable
arm7_9 dcc_downloads enable arm7_9 dcc_downloads enable

6
tcl/target/str912.cfg
View File

@ -13,7 +13,7 @@ if { [info exists ENDIAN] } {
} }
# jtag speed. We need to stick to 16kHz until we've finished reset. # jtag speed. We need to stick to 16kHz until we've finished reset.
jtag_rclk 16 adapter_khz 16
adapter_nsrst_delay 100 adapter_nsrst_delay 100
jtag_ntrst_delay 100 jtag_ntrst_delay 100
@ -48,11 +48,11 @@ jtag newtap $_CHIPNAME bs -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BST
set _TARGETNAME $_CHIPNAME.cpu set _TARGETNAME $_CHIPNAME.cpu
target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm966e
$_TARGETNAME configure -event reset-start { jtag_rclk 16 } $_TARGETNAME configure -event reset-start { adapter_khz 16 }
$_TARGETNAME configure -event reset-init { $_TARGETNAME configure -event reset-init {
# We can increase speed now that we know the target is halted. # We can increase speed now that we know the target is halted.
#jtag_rclk 3000 #adapter_khz 3000
# -- Enable 96K RAM # -- Enable 96K RAM
# PFQBC enabled / DTCM & AHB wait-states disabled # PFQBC enabled / DTCM & AHB wait-states disabled

4
tcl/target/ti_dm355.cfg
View File

@ -98,8 +98,8 @@ $_TARGETNAME configure \
# be absolutely certain the JTAG clock will work with the worst-case # be absolutely certain the JTAG clock will work with the worst-case
# CLKIN = 24 MHz (best case: 36 MHz) even when no bootloader turns # CLKIN = 24 MHz (best case: 36 MHz) even when no bootloader turns
# on the PLL and starts using it. OK to speed up after clock setup. # on the PLL and starts using it. OK to speed up after clock setup.
jtag_rclk 1500 adapter_khz 1500
$_TARGETNAME configure -event "reset-start" { jtag_rclk 1500 } $_TARGETNAME configure -event "reset-start" { adapter_khz 1500 }
arm7_9 fast_memory_access enable arm7_9 fast_memory_access enable
arm7_9 dcc_downloads enable arm7_9 dcc_downloads enable

4
tcl/target/ti_dm365.cfg
View File

@ -90,8 +90,8 @@ $_TARGETNAME configure \
# be absolutely certain the JTAG clock will work with the worst-case # be absolutely certain the JTAG clock will work with the worst-case
# CLKIN = 19.2 MHz (best case: 36 MHz) even when no bootloader turns # CLKIN = 19.2 MHz (best case: 36 MHz) even when no bootloader turns
# on the PLL and starts using it. OK to speed up after clock setup. # on the PLL and starts using it. OK to speed up after clock setup.
jtag_rclk 1500 adapter_khz 1500
$_TARGETNAME configure -event "reset-start" { jtag_rclk 1500 } $_TARGETNAME configure -event "reset-start" { adapter_khz 1500 }
arm7_9 fast_memory_access enable arm7_9 fast_memory_access enable
arm7_9 dcc_downloads enable arm7_9 dcc_downloads enable

4
tcl/target/ti_dm6446.cfg
View File

@ -70,8 +70,8 @@ $_TARGETNAME configure -work-area-phys 0x0000a000 -work-area-size 0x2000
# be absolutely certain the JTAG clock will work with the worst-case # be absolutely certain the JTAG clock will work with the worst-case
# CLKIN = 20 MHz (best case: 30 MHz) even when no bootloader turns # CLKIN = 20 MHz (best case: 30 MHz) even when no bootloader turns
# on the PLL and starts using it. OK to speed up after clock setup. # on the PLL and starts using it. OK to speed up after clock setup.
jtag_rclk 1500 adapter_khz 1500
$_TARGETNAME configure -event "reset-start" { jtag_rclk 1500 } $_TARGETNAME configure -event "reset-start" { adapter_khz 1500 }
arm7_9 fast_memory_access enable arm7_9 fast_memory_access enable
arm7_9 dcc_downloads enable arm7_9 dcc_downloads enable