From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Tue, 10 Apr 2012 22:02:51 +0000 (+0200)
Subject: Glyn Tonga2: Faster JTAG speed after CPU/RAM init.
X-Git-Tag: v0.6.0-rc1~146
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b6068f5a48f26db419217ac6b407a2746759e62a;p=openocd

Glyn Tonga2: Faster JTAG speed after CPU/RAM init.

Change-Id: Ib08dae0035355138c468483a7ee2d73aadedf430
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Reviewed-on: http://openocd.zylin.com/564
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---

diff --git a/tcl/board/glyn_tonga2.cfg b/tcl/board/glyn_tonga2.cfg
index 783ef9fa..17ed3cf2 100644
--- a/tcl/board/glyn_tonga2.cfg
+++ b/tcl/board/glyn_tonga2.cfg
@@ -16,10 +16,38 @@ source [find target/tmpa900.cfg]
 # Target configuration #
 ########################
 
-$_TARGETNAME configure -event reset-init { tonga2_init }
+# Initial JTAG speed should not exceed 1/6 of the initial CPU clock
+# frequency (24MHz). Be conservative and use 1/8 of the frequency.
+# (24MHz / 8 = 3MHz)
+adapter_khz 3000
 
-proc tonga2_init { } {
+$_TARGETNAME configure -event reset-start {
+	# Upon reset, set the JTAG frequency to 3MHz again, see above.
+	echo "Setting JTAG speed to 3MHz until clocks are initialized."
+	adapter_khz 3000
+
+	# Halt the CPU.
+	halt
+
+	# Disable faster memory access for now.
+	arm7_9 fast_memory_access disable
+}
+
+$_TARGETNAME configure -event reset-init {
+	# Setup clocks, and initialize SRAM and DDR SDRAM.
+	tonga2_init
 
+	# At this point the CPU is running at 192MHz, increase JTAG speed.
+	# Tests showed that 15MHz works OK, higher speeds can cause problems,
+	# though. Not sure if this is a CPU issue or JTAG adapter issue.
+	echo "Increasing JTAG speed to 15MHz."
+	adapter_khz 15000
+
+	# Enable faster memory access.
+	arm7_9 fast_memory_access enable
+}
+
+proc tonga2_init { } {
 	######################
 	# PLL initialization #
 	######################
@@ -160,6 +188,8 @@ proc tonga2_init { } {
 	# smc_direct_cmd_5 (SMC Direct Command register):
 	# cmd_type = UpdateRegs, chip_select = CS1
 	mww 0xf4311010 0x00c00000
+
+	echo "Clocks, SRAM, and DDR SDRAM are now initialized."
 }
 
 #######################