[Balloon-svn] r1189 - balloon/trunk/utils

Author: wookey
Date: 2010-07-15 19:00:15 +0100 (Thu, 15 Jul 2010)
New Revision: 1189

Modified:
balloon/trunk/utils/bbl
Log:
Change logic for resetting before --kernel to allow marvel pxas to be
programmed. May have broken previous --bootldr fix. whole reset logic
needs reworking - it's a mess.

Modified: balloon/trunk/utils/bbl
===================================================================
--- balloon/trunk/utils/bbl    2010-07-14 14:50:37 UTC (rev 1188)
+++ balloon/trunk/utils/bbl    2010-07-15 18:00:15 UTC (rev 1189)
@@ -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...