diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2013-03-27 14:04:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-03 17:01:13 +0100 |
| commit | 2d4f1fdadc24e2f8f707f964f3fab992427081ef (patch) | |
| tree | 554d19ead29240180b9a0dcfa3620e96492132c5 /scripts/runqemu-internal | |
| parent | 8866aeefb7e471d71cca0d2329ee48c87700abba (diff) | |
| download | ast2050-yocto-poky-2d4f1fdadc24e2f8f707f964f3fab992427081ef.zip ast2050-yocto-poky-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-x | scripts/runqemu-internal | 4 |
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 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" - QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" + QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then 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 return 1 fi KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" - QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb --no-reboot $QEMU_UI_OPTIONS" + QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot $QEMU_UI_OPTIONS" fi if [ "$MACHINE" = "qemuarmv6" ]; then QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136" |
