4 files changed, 58 insertions, 13 deletions

diff --git a/scripts/poky-addptable2image b/scripts/poky-addptable2image
new file mode 100755
index 0000000000..8602e5f085
--- /dev/null
+++ b/scripts/poky-addptable2image
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+IMAGE=$1
+IMAGEOUT=$2
+
+echo $IMAGE
+echo $IMAGEOUT
+
+size=`ls -l $IMAGE | awk '{ print $5}'`
+size2=`expr $size / 512 / 16 / 63`
+
+echo $size
+echo $size2
+
+# MBR Size = 512 * 63 bytes
+dd if=/dev/zero of=$IMAGEOUT count=63
+
+echo "x" > /tmp/fdisk.cmds
+echo "c" >> /tmp/fdisk.cmds
+echo "1024" >> /tmp/fdisk.cmds
+echo "h" >> /tmp/fdisk.cmds
+echo "16" >> /tmp/fdisk.cmds
+echo "r" >> /tmp/fdisk.cmds
+echo "n" >> /tmp/fdisk.cmds
+echo "p" >> /tmp/fdisk.cmds
+echo "1" >> /tmp/fdisk.cmds
+echo "1" >> /tmp/fdisk.cmds
+echo "$size2" >> /tmp/fdisk.cmds
+echo "w" >> /tmp/fdisk.cmds
+
+fdisk $IMAGEOUT < /tmp/fdisk.cmds
+cat $IMAGE >> $IMAGEOUT
\ No newline at end of file
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 9a5ed7722e..c2ba0c4ed7 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -40,6 +40,9 @@ else
     if [ "$MACHINE" = "akita" ]; then
         TYPE="jffs2"
     fi
+    if [ "$MACHINE" = "spitz" ]; then
+        TYPE="ext3"
+    fi
     HDIMAGE=$2
 fi
 
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index ab4ee5e616..4149e9e8a9 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -50,7 +50,7 @@ if [ ! -f "$ZIMAGE" ]; then
     exit 1
 fi
 
-if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" -a "$MACHINE" != "akita" ]; then
+if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" -a "$MACHINE" != "akita" -a "$MACHINE" != "spitz" ]; then
     echo "Error, unsupported machine type $MACHINE"
     exit 1
 fi
@@ -91,23 +91,22 @@ fi
 
 if [ "$MACHINE" = "spitz" ]; then
     QEMU=`which qemu-system-arm`
-#    QEMU=/usr/local/bin/qemu-system-arm
-#    if [ "$TYPE" = "ext2" ]; then
-#        if [ "x$HDIMAGE" = "x" ]; then
-#           HDIMAGE=`readlink -f $BUILDDIR/tmp/deploy/images/oh-image-sdk-spitz.ext2`
-#           if [ ! -e $HDIMAGE.mbr ]; then
-#               cp $OEROOT/mbr.bin $HDIMAGE.mbr
-#               cat $HDIMAGE >> $HDIMAGE.mbr
-#           fi
-#           HDIMAGE=$BUILDDIR/tmp/deploy/images/hdaimage.bin
-#        fi
-#        QEMUOPTIONS="-append \"root=/dev/sda mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M spitz -hda $HDIMAGE"
-#    fi
+    if [ "$TYPE" = "ext3" ]; then
+        echo $HDIMAGE
+        HDIMAGE=`readlink -f $HDIMAGE`
+        echo $HDIMAGE
+        if [ ! -e "$HDIMAGE.qemudisk" ]; then
+            echo "Adding a partition table to the ext3 image for use by QEMU, please wait..."
+            poky-addptable2image $HDIMAGE $HDIMAGE.qemudisk
+        fi
+        QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $HDIMAGE.qemudisk -vertical"
+    fi
 fi
 
 if [ "$MACHINE" = "akita" ]; then
     QEMU=`which qemu-system-arm`
     if [ "$TYPE" = "jffs2" ]; then
+        HDIMAGE=`readlink -f $HDIMAGE`
         if [ ! -e "$HDIMAGE.qemuflash" ]; then
             echo "Converting raw image into flash image format for use by QEMU, please wait..."
             raw2flash.akita < $HDIMAGE > $HDIMAGE.qemuflash
diff --git a/scripts/runqemu b/scripts/runqemu
index aa37974091..4c1e2ef78b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -43,6 +43,9 @@ else
     if [ "$MACHINE" = "akita" ]; then
         TYPE="jffs2"
     fi
+    if [ "$MACHINE" = "spitz" ]; then
+        TYPE="ext3"
+    fi
 fi
 
 if [ "x$3" != "x" ]; then
@@ -68,6 +71,14 @@ if [ "$MACHINE" = "qemuarm" ]; then
     fi
 fi
 
+if [ "$MACHINE" = "spitz" ]; then
+    if [ "$TYPE" = "ext3" ]; then
+        if [ "x$HDIMAGE" = "x" ]; then
+           HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-spitz.ext3
+        fi
+    fi
+fi
+
 if [ "$MACHINE" = "akita" ]; then
     if [ "$TYPE" = "jffs2" ]; then
         if [ "x$HDIMAGE" = "x" ]; then