From: michal smulski <michal.smulski@ooma.com>
Date: Sat, 24 Apr 2010 14:51:34 +0000 (+0200)
Subject: telo: update configuration scripts to matched master branch
X-Git-Tag: v0.5.0-rc1~739
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=c6cd253ae105a9542f051d4af3fda7e9a1c7140b

telo: update configuration scripts to matched master branch

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/tcl/board/telo.cfg b/tcl/board/telo.cfg
index a60cb02db8..1c0ad762fe 100644
--- a/tcl/board/telo.cfg
+++ b/tcl/board/telo.cfg
@@ -58,4 +58,4 @@ set _FLASHNAME $_CHIPNAME.flash
 flash bank $_FLASHNAME cfi 0x20000000 0x01000000 2 2 $_TARGETNAME
 
 # writing data to memory does not work without this
-memwrite burst disable
\ No newline at end of file
+arm11 memwrite burst disable
\ No newline at end of file
diff --git a/tcl/target/c100config.tcl b/tcl/target/c100config.tcl
index b08f909856..17a947604d 100644
--- a/tcl/target/c100config.tcl
+++ b/tcl/target/c100config.tcl
@@ -403,9 +403,9 @@ proc flashUBOOT {file} {
     flash erase_sector 0 0 3
     puts "Programming u-boot"
     putsUART0 "Programming u-boot..."
-    memwrite burst enable
+    arm11 memwrite burst enable
     flash write_image $file $EXP_CS0_BASEADDR
-    memwrite burst disable
+    arm11 memwrite burst disable
     putsUART0 "done.\n"
     putsUART0 "Rebooting, please wait!\n"
     reboot
diff --git a/tcl/target/c100helper.tcl b/tcl/target/c100helper.tcl
index 1fd58b6574..477fe5c2a0 100644
--- a/tcl/target/c100helper.tcl
+++ b/tcl/target/c100helper.tcl
@@ -325,7 +325,7 @@ proc setupDDR2 {} {
     if {$tmp == "128M"} {
 	configureDDR2regs_128M
     } elseif {$tmp == "256M"} {
-	configureDDR2regs_256B
+	configureDDR2regs_256M
     } else {
 	puts "Don't know how to configure DDR2 setup?"
     }
diff --git a/tcl/target/telo.cfg b/tcl/target/telo.cfg
deleted file mode 100644
index aa9ff22547..0000000000
--- a/tcl/target/telo.cfg
+++ /dev/null
@@ -1,61 +0,0 @@
-source [find target/c100.cfg]
-# basic register defintion for C100
-source [find target/c100regs.tcl]
-# board-config info
-source [find target/c100config.tcl]
-# C100 helper functions
-source [find target/c100helper.tcl]
-
-
-# Telo board & C100 support trst and srst
-# Note that libftd2xx.so tries to assert srst
-# which break this script
-# use libftdi.so library instead with this script
-# make the reset asserted to
-# allow RC circuit to discharge for: [ms]
-adapter_nsrst_assert_width 100
-jtag_ntrst_assert_width 100
-# don't talk to JTAG after reset for: [ms]
-adapter_nsrst_delay 100
-jtag_ntrst_delay 100
-reset_config trst_and_srst separate
-
-
-
-
-# issue telnet: reset init
-# issue gdb: monitor reset init
-$_TARGETNAME configure -event reset-init {
-	adapter_khz 100
-	# this will setup Telo board
-	setupTelo
-	#turn up the JTAG speed
-	adapter_khz 3000
-	puts "JTAG speed now 3MHz"
-	puts "type helpC100 to get help on C100"
-}
-
-$_TARGETNAME configure -event reset-deassert-post {
-	# Force target into ARM state.
-#	soft_reset_halt # not implemented on ARM11
-	puts "Detected SRSRT asserted on C100.CPU"
-
-}
-
-$_TARGETNAME configure -event reset-assert-post {
-  puts "Assering reset"
-  #sleep 10
-}
-
-proc power_restore {} { puts "Sensed power restore. No action." }
-proc srst_deasserted {} { puts "Sensed nSRST deasserted. No action." }
-
-
-# boots from NOR on CS0:  8 MBytes CFI flash, 16-bit bus
-# it's really 16MB but the upper 8mb is controller via gpio
-# openocd does not support 'complex reads/writes' to NOR
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME cfi 0x20000000 0x01000000 2 2 $_TARGETNAME
-
-# writing data to memory does not work without this
-memwrite burst disable