summaryrefslogtreecommitdiff
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-02 17:54:03 +0100
committerJoshua Lock <josh@linux.intel.com>2010-08-02 17:54:20 +0100
commitfa8c028fd005b87ad2e64c5b93221412355d94a6 (patch)
tree97f09c65778ed912ac6f119b5c9bbb81d5a26bf1 /scripts/runqemu
parentd9b1d4312cf1f981c5201b027b18594e9ad5a861 (diff)
downloadopenembedded-core-fa8c028fd005b87ad2e64c5b93221412355d94a6.tar.gz
openembedded-core-fa8c028fd005b87ad2e64c5b93221412355d94a6.tar.bz2
openembedded-core-fa8c028fd005b87ad2e64c5b93221412355d94a6.tar.xz
openembedded-core-fa8c028fd005b87ad2e64c5b93221412355d94a6.zip
scripts: add qemux86-64 support to the qemu scripts
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu27
1 files changed, 21 insertions, 6 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index c45b2a1c8..53ef5a5ef 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -85,7 +85,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
if [ "x$ZIMAGE" = "x" ]; then
ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin
fi
- CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/arm-poky-linux-gnueabi/bin
+ CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/bin
fi
function findimage {
@@ -182,22 +182,37 @@ if [ "$MACHINE" = "qemux86" ]; then
CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
fi
+if [ "$MACHINE" = "qemux86-64" ]; then
+ if [ "x$ZIMAGE" = "x" ]; then
+ ZIMAGE=$TMPDIR/deploy/images/bzImage-$MACHINE.bin
+ fi
+ if [ "$TYPE" = "ext3" ]; then
+ if [ "x$HDIMAGE" = "x" ]; then
+ T=$TMPDIR/deploy/images
+ findimage $T qemux86-64 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
+ fi
+ fi
+ CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
+fi
+
if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then
TARGET_SYS="arm-poky-linux"
elif [ "$MACHINE" = "qemux86" ]; then
TARGET_SYS="i586-poky-linux"
+elif [ "$MACHINE" = "qemux86-64" ]; then
+ TARGET_SYS="x86_64-poky-linux"
elif [ "$MACHINE" = "qemumips" ]; then
TARGET_SYS="mips-poky-linux"
fi
-if [ ! -e $CROSSPATH/$TARGET_SYS/bin/cc ]; then
- ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/cc
+if [ ! -e $CROSSPATH/bin/cc ]; then
+ ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/bin/cc
fi
-if [ ! -e $CROSSPATH/$TARGET_SYS/bin/gcc ]; then
- ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/gcc
+if [ ! -e $CROSSPATH/bin/gcc ]; then
+ ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/bin/gcc
fi
-CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$TMPDIR/cross/bin
+CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH
. $INTERNAL_SCRIPT