r1381 - trunk/src/host/devirginator

werner at sita.openmoko.org werner at sita.openmoko.org
Fri Mar 16 03:49:34 CET 2007


Author: werner
Date: 2007-03-16 03:49:30 +0100 (Fri, 16 Mar 2007)
New Revision: 1381

Modified:
   trunk/src/host/devirginator/openocd.in
   trunk/src/host/devirginator/setup.sh
Log:
setup.sh: pass USB ID cleanly 
openocd.in: increased wait_halt timeout from 300 sec to 500 sec (ouch !)



Modified: trunk/src/host/devirginator/openocd.in
===================================================================
--- trunk/src/host/devirginator/openocd.in	2007-03-15 22:25:14 UTC (rev 1380)
+++ trunk/src/host/devirginator/openocd.in	2007-03-16 02:49:30 UTC (rev 1381)
@@ -44,6 +44,6 @@
 # run
 bp 0 4 hw
 resume 0x32000000
-wait_halt 300
+wait_halt 500
 rbp 0
 resume

Modified: trunk/src/host/devirginator/setup.sh
===================================================================
--- trunk/src/host/devirginator/setup.sh	2007-03-15 22:25:14 UTC (rev 1380)
+++ trunk/src/host/devirginator/setup.sh	2007-03-16 02:49:30 UTC (rev 1381)
@@ -22,6 +22,9 @@
 #
 
 
+# USB ID of DFU target (Neo)
+USB_ID=-d1457:5119
+
 mkdir -p tmp
 
 
@@ -342,15 +345,15 @@
 if \$stage2; then
     echo === STAGE 2: DFU upload
     sleep 5
-    $DFU_UTIL -d1457:5119 -a kernel -D $UIMAGE
-    $DFU_UTIL -d1457:5119 -a rootfs -D $ROOTFS
-    $DFU_UTIL -d1457:5119 -a splash -D tmp/splash.gz
-    $DFU_UTIL -d1457:5119 -a u-boot_env -U tmp/env.old
+    $DFU_UTIL $USB_ID -a kernel -D $UIMAGE
+    $DFU_UTIL $USB_ID -a rootfs -D $ROOTFS
+    $DFU_UTIL $USB_ID -a splash -D tmp/splash.gz
+    $DFU_UTIL $USB_ID -a u-boot_env -U tmp/env.old
     ./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT \
       "reset halt" wait_halt resume exit
     sleep 5
     ./envedit.pl -i tmp/env.old -o tmp/env.new -f tmp/environment
-    $DFU_UTIL -d1457:5119 -a u-boot_env -D tmp/env.new
+    $DFU_UTIL $USB_ID -a u-boot_env -D tmp/env.new
     ./openocdcmd.pl $OPENOCD_HOST $OPENOCD_PORT "reset run" exit
 fi
 





More information about the commitlog mailing list