summaryrefslogtreecommitdiffstats
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)
downloadpoky-fa8c028fd005b87ad2e64c5b93221412355d94a6.tar.gz
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 c45b2a1c86..53ef5a5efb 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -85,7 +85,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
85 if [ "x$ZIMAGE" = "x" ]; then 85 if [ "x$ZIMAGE" = "x" ]; then
86 ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin 86 ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin
87 fi 87 fi
88 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/arm-poky-linux-gnueabi/bin 88 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/bin
89fi 89fi
90 90
91function findimage { 91function findimage {
@@ -182,22 +182,37 @@ if [ "$MACHINE" = "qemux86" ]; then
182 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr 182 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
183fi 183fi
184 184
185if [ "$MACHINE" = "qemux86-64" ]; then
186 if [ "x$ZIMAGE" = "x" ]; then
187 ZIMAGE=$TMPDIR/deploy/images/bzImage-$MACHINE.bin
188 fi
189 if [ "$TYPE" = "ext3" ]; then
190 if [ "x$HDIMAGE" = "x" ]; then
191 T=$TMPDIR/deploy/images
192 findimage $T qemux86-64 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
193 fi
194 fi
195 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
196fi
197
185if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then 198if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then
186 TARGET_SYS="arm-poky-linux" 199 TARGET_SYS="arm-poky-linux"
187elif [ "$MACHINE" = "qemux86" ]; then 200elif [ "$MACHINE" = "qemux86" ]; then
188 TARGET_SYS="i586-poky-linux" 201 TARGET_SYS="i586-poky-linux"
202elif [ "$MACHINE" = "qemux86-64" ]; then
203 TARGET_SYS="x86_64-poky-linux"
189elif [ "$MACHINE" = "qemumips" ]; then 204elif [ "$MACHINE" = "qemumips" ]; then
190 TARGET_SYS="mips-poky-linux" 205 TARGET_SYS="mips-poky-linux"
191fi 206fi
192 207
193if [ ! -e $CROSSPATH/$TARGET_SYS/bin/cc ]; then 208if [ ! -e $CROSSPATH/bin/cc ]; then
194 ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/cc 209 ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/bin/cc
195fi 210fi
196 211
197if [ ! -e $CROSSPATH/$TARGET_SYS/bin/gcc ]; then 212if [ ! -e $CROSSPATH/bin/gcc ]; then
198 ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/gcc 213 ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/bin/gcc
199fi 214fi
200 215
201CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$TMPDIR/cross/bin 216CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH
202 217
203. $INTERNAL_SCRIPT 218. $INTERNAL_SCRIPT