summaryrefslogtreecommitdiffstats
path: root/scripts/poky-qemu-internal
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/poky-qemu-internal')
-rwxr-xr-xscripts/poky-qemu-internal8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index b9061ecd8e..327c0dd3d6 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -88,7 +88,7 @@ fi
88 88
89if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then 89if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
90 QEMU=qemu-system-arm 90 QEMU=qemu-system-arm
91 if [ "$TYPE" = "ext2" ]; then 91 if [ "$TYPE" = "ext3" ]; then
92 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 92 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
93 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot" 93 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot"
94 fi 94 fi
@@ -113,9 +113,9 @@ fi
113 113
114if [ "$MACHINE" = "qemux86" ]; then 114if [ "$MACHINE" = "qemux86" ]; then
115 QEMU=qemu 115 QEMU=qemu
116 if [ "$TYPE" = "ext2" ]; then 116 if [ "$TYPE" = "ext3" ]; then
117 KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 117 KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
118 QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" 118 QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
119 fi 119 fi
120 if [ "$TYPE" = "nfs" ]; then 120 if [ "$TYPE" = "nfs" ]; then
121 if [ "x$HDIMAGE" = "x" ]; then 121 if [ "x$HDIMAGE" = "x" ]; then
@@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then
126 return 126 return
127 fi 127 fi
128 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 128 KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
129 QEMUOPTIONS="-std-vga -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" 129 QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
130 fi 130 fi
131fi 131fi
132 132