Author: zumbi
Date: 2010-07-16 02:08:15 +0100 (Fri, 16 Jul 2010)
New Revision: 1190

Modified:
   balloon/tags/1.0-rc1/utils/bbl
   balloon/tags/1.0-rc1/utils/openocd/target/pxa270updated.cfg
Log:
bbl bump and add Marvell CPUTAPID for OCD target

Modified: balloon/tags/1.0-rc1/utils/bbl
===================================================================
--- balloon/tags/1.0-rc1/utils/bbl	2010-07-15 18:00:15 UTC (rev 1189)
+++ balloon/tags/1.0-rc1/utils/bbl	2010-07-16 01:08:15 UTC (rev 1190)
@@ -23,9 +23,10 @@
 
 # This script requires chat, sx, date and the bbl utilities to be installed
 
-VERSION="0.42"
+VERSION="0.43"
 # Change History
 
+# v0.43: fix --kernel with openocd reset logic (maybe broke --bootldr?)
 # v0.42: Fix --bootldr with openocd reset logic
 # v0.41: Reduce sleep time on sendcommand from 0.5 to 0.4
 # v0.4:  Add basic openOCD support for uploads
@@ -662,11 +663,7 @@
       echo -e "**Check serial cable attached, Reset board - then hit Return**\a" 
       read KEY
   fi
-  if [ $OPENOCD ]; then
-    doreset
-  else
     resetwait
-  fi
 fi
 
 # be nice if this function could be initrd too...

Modified: balloon/tags/1.0-rc1/utils/openocd/target/pxa270updated.cfg
===================================================================
--- balloon/tags/1.0-rc1/utils/openocd/target/pxa270updated.cfg	2010-07-15 18:00:15 UTC (rev 1189)
+++ balloon/tags/1.0-rc1/utils/openocd/target/pxa270updated.cfg	2010-07-16 01:08:15 UTC (rev 1190)
@@ -16,10 +16,12 @@
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
    set _CPUTAPID1 $CPUTAPID
+   set _CPUTAPID2 $CPUTAPID
 } else {
   # set useful default
    set _CPUTAPID 0x49265013
    set _CPUTAPID1 0x79265013
+   set _CPUTAPID2 0x89265013
 }
 
 
@@ -31,7 +33,7 @@
 jtag_ntrst_delay 250
 
 set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID -expected-id $_CPUTAPID1
+jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID -expected-id $_CPUTAPID1  -expected-id $_CPUTAPID2
 
 target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -variant pxa27x
 # maps to PXA internal RAM. If you are using a PXA255