From 86db48cd17bb2853e2074cc5625e005faf09ce87 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Mon, 29 Jan 2007 17:03:29 +0000
Subject: scripts: Add framework for supporting akita images under qemu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1214 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
scripts/poky-qemu | 11 +++++++----
scripts/poky-qemu-internal | 17 ++++++++---------
scripts/runqemu | 12 +++++++++++-
3 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 6c53b07723..9a5ed7722e 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 a88f52ace8..ab4ee5e616 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 d3643a626e..aa37974091 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
--
cgit v1.2.3-54-g00ecf