summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-qemu-internal35
-rwxr-xr-xscripts/runqemu27
2 files changed, 53 insertions, 9 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 6c49ddeaf9..62c64727c0 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -35,6 +35,9 @@ if [ -z "$QEMU_MEMORY" ]; then
35 "qemux86") 35 "qemux86")
36 QEMU_MEMORY="128M" 36 QEMU_MEMORY="128M"
37 ;; 37 ;;
38 "qemux86-64")
39 QEMU_MEMORY="128M"
40 ;;
38 "qemumips") 41 "qemumips")
39 QEMU_MEMORY="128M" 42 QEMU_MEMORY="128M"
40 ;; 43 ;;
@@ -68,6 +71,7 @@ case "$MACHINE" in
68 "qemuarmv6") ;; 71 "qemuarmv6") ;;
69 "qemuarmv7") ;; 72 "qemuarmv7") ;;
70 "qemux86") ;; 73 "qemux86") ;;
74 "qemux86-64") ;;
71 "akita") ;; 75 "akita") ;;
72 "spitz") ;; 76 "spitz") ;;
73 "nokia800") ;; 77 "nokia800") ;;
@@ -136,6 +140,26 @@ if [ "$MACHINE" = "qemux86" ]; then
136 fi 140 fi
137fi 141fi
138 142
143if [ "$MACHINE" = "qemux86-64" ]; then
144 QEMU=qemu-system-x86_64
145 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
146 if [ "$TYPE" = "ext3" ]; then
147 KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
148 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $HDIMAGE $QEMU_UI_OPTIONS"
149 fi
150 if [ "$TYPE" = "nfs" ]; then
151 if [ "x$HDIMAGE" = "x" ]; then
152 HDIMAGE=/srv/nfs/qemux86-64
153 fi
154 if [ ! -d "$HDIMAGE" ]; then
155 echo "Error: NFS mount point $HDIMAGE doesn't exist."
156 return
157 fi
158 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
159 QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
160 fi
161fi
162
139if [ "$MACHINE" = "spitz" ]; then 163if [ "$MACHINE" = "spitz" ]; then
140 QEMU=qemu-system-arm 164 QEMU=qemu-system-arm
141 if [ "$TYPE" = "ext3" ]; then 165 if [ "$TYPE" = "ext3" ]; then
@@ -231,14 +255,19 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
231 return 255 return
232fi 256fi
233 257
234SDKDIR="/usr/local/poky/eabi-glibc" 258SDKDIR="/opt/poky/sysroots"
235if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then 259if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then
236 SDKPATH="$SDKDIR/arm/arm-poky-linux-gnueabi/bin:$SDKDIR/arm/bin" 260 SDKPATH="$SDKDIR/arm-poky-linux-gnueabi/bin"
237fi 261fi
238 262
239if [ "$MACHINE" = "qemux86" ]; then 263if [ "$MACHINE" = "qemux86" ]; then
240 SDKPATH="$SDKDIR/i586/i586-poky-linux/bin:$SDKDIR/i586/bin" 264 SDKPATH="$SDKDIR/i586-poky-linux/bin"
241fi 265fi
266
267if [ "$MACHINE" = "qemux86-64" ]; then
268 SDKPATH="$SDKDIR/x86_64-poky-linux/bin"
269fi
270
242PATH=$CROSSPATH:$SDKPATH:$PATH 271PATH=$CROSSPATH:$SDKPATH:$PATH
243 272
244QEMUBIN=`which $QEMU` 273QEMUBIN=`which $QEMU`
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