summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/poky-qemu11
-rwxr-xr-xscripts/poky-qemu-internal17
-rwxr-xr-xscripts/runqemu12
3 files changed, 26 insertions, 14 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 6c53b0772..9a5ed7722 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -29,16 +29,19 @@ else
ZIMAGE=$1
fi
+if [ "x$MACHINE" = "x" ]; then
+ MACHINE=`basename $ZIMAGE | sed -r -e 's#.*-([a-z]+[0-9]*)-?[0-9]*..*#\1#'`
+fi
+
if [ "x$2" = "x" ]; then
TYPE="nfs"
else
TYPE="ext2"
+ if [ "$MACHINE" = "akita" ]; then
+ TYPE="jffs2"
+ fi
HDIMAGE=$2
fi
-if [ "x$MACHINE" = "x" ]; then
- MACHINE=`basename $ZIMAGE | sed -r -e 's#.*-([a-z]+[0-9]*)-?[0-9]*..*#\1#'`
-fi
-
INTERNAL_SCRIPT=`which poky-qemu-internal`
. $INTERNAL_SCRIPT
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index a88f52ace..ab4ee5e61 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" ]; then
+if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" -a "$MACHINE" != "akita" ]; then
echo "Error, unsupported machine type $MACHINE"
exit 1
fi
@@ -107,14 +107,13 @@ fi
if [ "$MACHINE" = "akita" ]; then
QEMU=`which qemu-system-arm`
-# QEMU=/usr/local/bin/qemu-system-arm
-# if [ "$TYPE" = "ext2" ]; then
-# if [ "x$HDIMAGE" = "x" ]; then
-# HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-sdk-akita.jffs2
-# HDIMAGE=$BUILDDIR/tmp/deploy/images/akita.test
-# fi
-# QEMUOPTIONS="$QEMU_NETWORK_CMD -M akita -hdd $HDIMAGE"
-# fi
+ if [ "$TYPE" = "jffs2" ]; then
+ if [ ! -e "$HDIMAGE.qemuflash" ]; then
+ echo "Converting raw image into flash image format for use by QEMU, please wait..."
+ raw2flash.akita < $HDIMAGE > $HDIMAGE.qemuflash
+ fi
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -M akita -mtdblock $HDIMAGE.qemuflash -vertical"
+ fi
fi
if [ "x$QEMUOPTIONS" = "x" ]; then
diff --git a/scripts/runqemu b/scripts/runqemu
index d3643a626..aa3797409 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -40,6 +40,9 @@ if [ "x$2" != "x" ]; then
TYPE=$2
else
TYPE="ext2"
+ if [ "$MACHINE" = "akita" ]; then
+ TYPE="jffs2"
+ fi
fi
if [ "x$3" != "x" ]; then
@@ -57,7 +60,6 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux/bin
fi
-
if [ "$MACHINE" = "qemuarm" ]; then
if [ "$TYPE" = "ext2" ]; then
if [ "x$HDIMAGE" = "x" ]; then
@@ -66,6 +68,14 @@ if [ "$MACHINE" = "qemuarm" ]; then
fi
fi
+if [ "$MACHINE" = "akita" ]; then
+ if [ "$TYPE" = "jffs2" ]; then
+ if [ "x$HDIMAGE" = "x" ]; then
+ HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-akita.jffs2
+ fi
+ fi
+fi
+
if [ "$MACHINE" = "qemux86" ]; then
if [ "x$ZIMAGE" = "x" ]; then
ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin