[oe-commits] Martin Jansa : runqemu-internal: use MACHINE_SUBTYPE variable for qemuarm*
git at git.openembedded.org
git at git.openembedded.org
Thu Apr 4 13:11:25 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: ed07bb4214abb472da6aa7e164a20fd4be127e54
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ed07bb4214abb472da6aa7e164a20fd4be127e54
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Wed Mar 27 14:04:23 2013 +0100
runqemu-internal: use MACHINE_SUBTYPE variable for qemuarm*
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
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"
More information about the Openembedded-commits
mailing list