summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-03-27 13:04:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 16:01:13 (GMT)
commit2d4f1fdadc24e2f8f707f964f3fab992427081ef (patch)
tree554d19ead29240180b9a0dcfa3620e96492132c5 /scripts/runqemu-internal
parent8866aeefb7e471d71cca0d2329ee48c87700abba (diff)
downloadpoky-2d4f1fdadc24e2f8f707f964f3fab992427081ef.tar.gz
runqemu-internal: use MACHINE_SUBTYPE variable for qemuarm*
(From OE-Core rev: ed07bb4214abb472da6aa7e164a20fd4be127e54) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index f06870e..762c584 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -302,7 +302,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
302 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" 302 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
303 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 303 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
304 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" 304 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
305 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 305 QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
306 fi 306 fi
307 if [ "$FSTYPE" = "nfs" ]; then 307 if [ "$FSTYPE" = "nfs" ]; then
308 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 308 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
@@ -311,7 +311,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
311 return 1 311 return 1
312 fi 312 fi
313 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 313 KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
314 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb --no-reboot $QEMU_UI_OPTIONS" 314 QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot $QEMU_UI_OPTIONS"
315 fi 315 fi
316 if [ "$MACHINE" = "qemuarmv6" ]; then 316 if [ "$MACHINE" = "qemuarmv6" ]; then
317 QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136" 317 QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136"