summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-10 12:15:48 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-10 12:15:48 +0100
commitde687629d89740d8f748f8a0b11650e5649c66e4 (patch)
treed55659eb3ea48036aa11fbd55b0a5589e34a174f
parent824dce8d18f753af1caeeb65fcd581d7cff41205 (diff)
downloadpoky-de687629d89740d8f748f8a0b11650e5649c66e4.tar.gz
poky-de687629d89740d8f748f8a0b11650e5649c66e4.tar.bz2
poky-de687629d89740d8f748f8a0b11650e5649c66e4.zip
scripts: Update qemux86 to use the vmmouse driver, not wacom and find moblin images
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xscripts/poky-qemu-internal4
-rwxr-xr-xscripts/runqemu2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 685d8d7a23..3cc7a70256 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -115,7 +115,7 @@ if [ "$MACHINE" = "qemux86" ]; then
QEMU=qemu
if [ "$TYPE" = "ext3" ]; then
KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
- QEMUOPTIONS="-vga vmware $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet -enable-gl"
+ QEMUOPTIONS="-vga vmware $QEMU_NETWORK_CMD -hda $HDIMAGE -enable-gl"
fi
if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then
@@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then
return
fi
KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
+ QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD"
fi
fi
diff --git a/scripts/runqemu b/scripts/runqemu
index 7d5107f144..eaee811187 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -134,7 +134,7 @@ if [ "$MACHINE" = "qemux86" ]; then
if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
T=$BUILDDIR/tmp/deploy/images
- findimage $T qemux86 ext3 "poky-image-sdk poky-image-sato poky-image-minimal moblin-image-netbook"
+ findimage $T qemux86 ext3 "molbin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
fi
fi
CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin