[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-90-g679f660

[Spencer O. <nt...@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  679f6602fd1a7e9763bac52f06bbf2db28098d9a (commit)
       via  82f44a4708cdfdf2bf4b386a4751e6b43adad2b2 (commit)
      from  ab5f98edcd3e8810c15d378d3244238d9d8f8d0e (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 679f6602fd1a7e9763bac52f06bbf2db28098d9a
Author: Spencer Oliver <nt...@us...>
Date:   Tue Mar 16 09:59:05 2010 +0000

    PARPORT: add PARPORTADDR tcl variable
    
    Add PARPORTADDR tcl variable making it easier to
    change parallel port address in scripts.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/tcl/interface/flashlink.cfg b/tcl/interface/flashlink.cfg
index 4b00de9..5c81cf5 100644
--- a/tcl/interface/flashlink.cfg
+++ b/tcl/interface/flashlink.cfg
@@ -5,6 +5,12 @@
 # http://www.st.com/stonline/products/literature/um/7889.pdf
 #
 
+if { [info exists PARPORTADDR] } {
+   set  _PARPORTADDR $PARPORTADDR
+} else {
+   set  _PARPORTADDR 0
+}
+
 interface parport
-parport_port 0
+parport_port $_PARPORTADDR
 parport_cable flashlink
diff --git a/tcl/interface/parport.cfg b/tcl/interface/parport.cfg
index 0f18ce9..326005a 100644
--- a/tcl/interface/parport.cfg
+++ b/tcl/interface/parport.cfg
@@ -3,6 +3,12 @@
 #
 # Addresses: 0x378/LPT1 or 0x278/LPT2 ...
 
+if { [info exists PARPORTADDR] } {
+   set  _PARPORTADDR $PARPORTADDR
+} else {
+   set  _PARPORTADDR 0x378
+}
+
 interface parport
-parport_port 0x378
+parport_port $_PARPORTADDR
 parport_cable wiggler
diff --git a/tcl/interface/parport_dlc5.cfg b/tcl/interface/parport_dlc5.cfg
index 85caefc..d0f183f 100644
--- a/tcl/interface/parport_dlc5.cfg
+++ b/tcl/interface/parport_dlc5.cfg
@@ -4,7 +4,13 @@
 # http://www.xilinx.com/itp/xilinx4/data/docs/pac/appendixb.html
 #
 
+if { [info exists PARPORTADDR] } {
+   set  _PARPORTADDR $PARPORTADDR
+} else {
+   set  _PARPORTADDR 0
+}
+
 interface parport
-parport_port 0
+parport_port $_PARPORTADDR
 parport_cable dlc5
 

commit 82f44a4708cdfdf2bf4b386a4751e6b43adad2b2
Author: Spencer Oliver <nt...@us...>
Date:   Tue Mar 16 09:55:20 2010 +0000

    PIC32: add Microchip Explorer16 cfg
    
    - add Microchip Explorer16 cfg using PIC32MX360F512L PIM.
     - remove reset config from PIC32 target cfg.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/tcl/board/microchip_explorer16.cfg b/tcl/board/microchip_explorer16.cfg
new file mode 100644
index 0000000..f5c4faa
--- /dev/null
+++ b/tcl/board/microchip_explorer16.cfg
@@ -0,0 +1,13 @@
+# Microchip Explorer 16 with PIC32MX360F512L PIM module.
+# http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&nodeId=1406&dDocName=en024858
+
+# TAPID for PIC32MX360F512L
+set CPUTAPID 0x30938053
+
+# use 32k working area
+set WORKAREASIZE 32768
+
+source [find target/pic32mx.cfg]
+
+# For more information about the configuration files, take a look at:
+# openocd.texi
diff --git a/tcl/board/pic-p32mx.cfg b/tcl/board/pic-p32mx.cfg
index 412a506..661e3d6 100644
--- a/tcl/board/pic-p32mx.cfg
+++ b/tcl/board/pic-p32mx.cfg
@@ -2,7 +2,3 @@
 
 set CPUTAPID 0x40916053
 source [find target/pic32mx.cfg]
-
-init
-flash probe 0
-flash probe 1
diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index 8c9a93d..673d254 100644
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -14,7 +14,7 @@ if { [info exists ENDIAN] } {
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
-  # force an error till we get a good number
+   # force an error till we get a good number
    set _CPUTAPID 0x30938053
 }
 
@@ -29,9 +29,6 @@ if { [info exists WORKAREASIZE] } {
 adapter_nsrst_delay 100
 jtag_ntrst_delay 100
 
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config srst_only
-
 #jtag scan chain
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID

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

Summary of changes:
 tcl/board/microchip_explorer16.cfg |   13 +++++++++++++
 tcl/board/pic-p32mx.cfg            |    4 ----
 tcl/interface/flashlink.cfg        |    8 +++++++-
 tcl/interface/parport.cfg          |    8 +++++++-
 tcl/interface/parport_dlc5.cfg     |    8 +++++++-
 tcl/target/pic32mx.cfg             |    5 +----
 6 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 tcl/board/microchip_explorer16.cfg


hooks/post-receive
-- 
Main OpenOCD repository