summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-qemu3
-rwxr-xr-xscripts/poky-qemu-internal17
-rwxr-xr-xscripts/runqemu5
3 files changed, 15 insertions, 10 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index 1c680b11f1..79456f6a60 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -50,7 +50,4 @@ fi
50 50
51INTERNAL_SCRIPT=`which poky-qemu-internal` 51INTERNAL_SCRIPT=`which poky-qemu-internal`
52 52
53SDKDIR=/usr/local/poky/eabi-glibc/arm/bin/
54PATH=$SDKDIR:$PATH
55
56. $INTERNAL_SCRIPT 53. $INTERNAL_SCRIPT
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index ceb6afdbf3..b43639eb77 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -19,8 +19,9 @@
19 19
20 20
21# Call setting: 21# Call setting:
22# QEMU_MEMORY (optional) set the amount of memory in the emualted system. 22# QEMU_MEMORY (optional) - set the amount of memory in the emualted system.
23# SERIAL_LOGFILE (optional) log the serial port output to a file 23# SERIAL_LOGFILE (optional) - log the serial port output to a file
24# CROSSPATH - the path to any cross toolchain to use with distcc
24# 25#
25# Image options: 26# Image options:
26# MACHINE - the machine to run 27# MACHINE - the machine to run
@@ -128,9 +129,19 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
128 return 129 return
129fi 130fi
130 131
132SDKDIR="/usr/local/poky/eabi-glibc"
133if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" ]; then
134 SDKPATH="$SDKDIR/arm/arm-poky-linux-gnueabi/bin:$SDKDIR/arm/bin"
135fi
136
137if [ "$MACHINE" = "qemux86" ]; then
138 SDKPATH="$SDKDIR/i586/i586-poky-linux/bin:$SDKDIR/i586/bin"
139fi
140PATH=$CROSSPATH:$SDKPATH:$PATH
141
131function _quit() { 142function _quit() {
132 if [ -n "$PIDFILE" ]; then 143 if [ -n "$PIDFILE" ]; then
133 echo kill `cat $PIDFILE` 144 #echo kill `cat $PIDFILE`
134 kill `cat $PIDFILE` 145 kill `cat $PIDFILE`
135 fi 146 fi
136 return 147 return
diff --git a/scripts/runqemu b/scripts/runqemu
index 0176e636a8..070d371c62 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -25,9 +25,6 @@ fi
25 25
26INTERNAL_SCRIPT=`which poky-qemu-internal` 26INTERNAL_SCRIPT=`which poky-qemu-internal`
27 27
28SDKDIR=/usr/local/poky/eabi-glibc/arm/bin/
29PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/usr/bin:$BUILDDIR/tmp/cross/bin:$SDKDIR:$PATH
30
31if [ "x$1" = "x" ]; then 28if [ "x$1" = "x" ]; then
32 echo 29 echo
33 echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE" 30 echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE"
@@ -118,7 +115,7 @@ if [ "$MACHINE" = "qemux86" ]; then
118 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin 115 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin
119fi 116fi
120 117
121export PATH=$CROSSPATH:$PATH 118CROSSPATH=$BUILDDIR/tmp/staging/$BUILD_SYS/usr/bin:$CROSSPATH:$BUILDDIR/tmp/cross/bin
122 119
123if [ ! -e $CROSSPATH/cc ]; then 120if [ ! -e $CROSSPATH/cc ]; then
124 ln -s $CROSSPATH/gcc $CROSSPATH/cc 121 ln -s $CROSSPATH/gcc $CROSSPATH/cc