Changeset 1977

Timestamp:

05/16/07 21:47:42 (6 years ago)

Author:

andrew

Message:

Make flash.sh less timing dependent by using correct qemu shutdown. Fix usb-gadget initialisation with no '-usb'.

Location:

trunk/src/host/qemu-neo1973

Files:

• openmoko/flash.sh (modified) (3 diffs)
• vl.c (modified) (2 diffs)

trunk/src/host/qemu-neo1973/openmoko/flash.sh

@@ -72 +72 @@
 # for us to be able to issue u-boot commands.
 # This is also an example of how you *shouldn't* write scripts.
+# We should parse the u-boot output for command prompt lines and only
+# issue commands when u-boot is awaiting them.
 emu () {
         $qemu -mtdblock "$script_dir/$flash_image" -kernel "$script_dir/$1" \
@@ -78 +80 @@
 uboot () {
         cd $src_dir
-        emu $1 <<< "$3"
+        emu $1 <<< "                               
+$3
+neo1973 power-off
+"
         echo Please wait, programming the NAND flash...
-        sleep $2
-        kill $pid # Ugly, use the qemu monitor instead
-        sleep 1
-        kill -9 $pid
-        sleep 1
+        (sleep $2; kill $pid; sleep 1; kill -KILL $pid)& timer=$!
+        if ! wait $pid; then
+                kill $timer
+                echo
+                echo U-boot failed to finish writing in $2 seconds, giving up.
+                echo
+                exit -1
+        fi
+        kill $timer
         cd $script_dir
 }
 
 # Set up BBT, u-boot environment, boot menu and program u-boot binary.
-uboot $uboot_image 40 "               
+uboot $uboot_image 300 "
 setenv dontask y
 nand createbbt
@@ -104 +113 @@
 
 # Program bootsplash.
-uboot splash.gz 10 "               
+uboot splash.gz 60 "
 nand write.e $kernel_addr splash $splash_size"
 
 # Program the kernel binary.
-uboot $kernel_image 10 "               
+uboot $kernel_image 60 "
 nand write.e $kernel_addr kernel $kernel_size"
 
 # Program the root filesystem.
-uboot $rootfs_image 20 "               
+uboot $rootfs_image 120 "
 nand write.jffs2 $kernel_addr rootfs $rootfs_size"
 

trunk/src/host/qemu-neo1973/vl.c

@@ -4310 +4310 @@
     USBPort *port;
 
+    if (strstart(devname, "gadget", &p)) {
+        dev = usb_gadget;
+        port = host_usb_ports;
+        if (!dev || !port)
+            return -1;
+        if (p[0] == ':')
+            usb_gadget_config_set(port, strtoul(&p[1], NULL, 0));
+        else if (p[0] != 0)
+            return -1;
+        goto attach;
+    }
+
     if (!free_usb_ports)
         return -1;
@@ -4326 +4338 @@
             return -1;
         dev = usb_net_init(&nd_table[nr]);
-    } else if (strstart(devname, "gadget", &p)) {
-        dev = usb_gadget;
-        port = host_usb_ports;
-        if (!dev || !port)
-            return -1;
-        if (p[0] == ':')
-            usb_gadget_config_set(port, strtoul(&p[1], NULL, 0));
-        else if (p[0] != 0)
-            return -1;
-        goto attach;
     } else {
         return -1;