diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-05 16:00:31 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-05 16:00:31 +0000 |
| commit | eae7eb5bd559c1f4ae843820f2d4105066b3cc45 (patch) | |
| tree | ed9c2119f83c805bd289e2e3ec12c412a1b9335d /scripts/poky-qemu-internal | |
| parent | e45a4a847c40eebc2baa9041f95d623cbe87cc9e (diff) | |
| download | openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.gz openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.bz2 openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.tar.xz openembedded-core-eae7eb5bd559c1f4ae843820f2d4105066b3cc45.zip | |
scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images
Diffstat (limited to 'scripts/poky-qemu-internal')
| -rwxr-xr-x | scripts/poky-qemu-internal | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index b9061ecd8..327c0dd3d 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal @@ -88,7 +88,7 @@ fi if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then QEMU=qemu-system-arm - if [ "$TYPE" = "ext2" ]; then + if [ "$TYPE" = "ext3" ]; then KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot" fi @@ -113,9 +113,9 @@ fi if [ "$MACHINE" = "qemux86" ]; then QEMU=qemu - if [ "$TYPE" = "ext2" ]; then + if [ "$TYPE" = "ext3" ]; then KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" - QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" + QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" 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="-std-vga -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" + QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" fi fi |