[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-416-g2fdc1db

[David B. <dbr...@us...>]

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  2fdc1db30481279e39cdb1928a7455f75e34eb3f (commit)
      from  a4dace3122749991136d9d50ef685f5d641d3295 (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 2fdc1db30481279e39cdb1928a7455f75e34eb3f
Author: David Brownell <dbr...@us...>
Date:   Sat Jul 17 02:59:23 2010 -0400

    lm3s811-ek uses generic stellaris target config
    
    There's no point in an lm3s811-specific target file,
    so remove it in favor of the generic "stellaris.cfg".
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/NEWS b/NEWS
index 2dd14cc..bb746fa 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,7 @@ Board, Target, and Interface Configuration Scripts:
 	Support Voipac PXA270/PXA270M module.
 	New $PARPORTADDR tcl variable used to change default
 		parallel port address used.
+	Remove lm3s811.cfg; use "stellaris.cfg" instead
 
 Core Jim/TCL Scripting:
 	New "add_script_search_dir" command, behaviour is the same
diff --git a/tcl/board/ek-lm3s811.cfg b/tcl/board/ek-lm3s811.cfg
index 7d3f2ce..66519f6 100644
--- a/tcl/board/ek-lm3s811.cfg
+++ b/tcl/board/ek-lm3s811.cfg
@@ -4,13 +4,14 @@
 # http://www.luminarymicro.com/products/stellaris_811_evaluation_kits.html
 
 # include the FT2232 interface config for on-board JTAG interface
+# NOTE:  older '811-EK boards (before rev C) shouldn't use this.
 source [find interface/luminary.cfg]
 
+   set  CHIPNAME lm3s811
+
 # include the target config
-source [find target/lm3s811.cfg]
+source [find target/stellaris.cfg]
 
-# jtag speed
-adapter_khz 500
 
 adapter_nsrst_delay 100
 
diff --git a/tcl/target/lm3s811.cfg b/tcl/target/lm3s811.cfg
deleted file mode 100644
index 49879d0..0000000
--- a/tcl/target/lm3s811.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-# Script for TI/Luminary Stellaris LM3S811
-
-if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
-} else {
-   set  _CHIPNAME lm3s811
-}
-
-if { [info exists CPUTAPID ] } {
-   set _CPUTAPID $CPUTAPID
-} else {
-   set _CPUTAPID 0x3ba00477
-}
-
-#jtag scan chain
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 1 -irmask 0xf -expected-id $_CPUTAPID
-
-# the luminary variant causes a software reset rather than asserting SRST
-# this stops the debug registers from being cleared
-# this will be fixed in later revisions of silicon
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m3 -chain-position $_CHIPNAME.cpu -variant lm3s
-
-# 8k working area at base of ram, not backed up
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 0x2000
-
-#flash configuration
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME stellaris 0 0 0 0 $_TARGETNAME

-----------------------------------------------------------------------

Summary of changes:
 NEWS                     |    1 +
 tcl/board/ek-lm3s811.cfg |    7 ++++---
 tcl/target/lm3s811.cfg   |   29 -----------------------------
 3 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 tcl/target/lm3s811.cfg


hooks/post-receive
-- 
Main OpenOCD repository