summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-01-23 17:54:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 10:20:10 (GMT)
commit21b3f5ddb1abedcff084bcbb97fdda08b5aefe53 (patch)
treec9b1cf3758d09a154af8f3780a4283ad8a9308ae /scripts/runqemu-internal
parentc47def3b049a61da0886af2e4325cf9a564bbcd6 (diff)
downloadpoky-21b3f5ddb1abedcff084bcbb97fdda08b5aefe53.tar.gz
linux-yocto/qemuppc: fix console and ethernet
Two issues are fixed with this commit, the ability to use the keyboard on a graphical qemu boot and enabling ethernet by default on a 3.0 kernel. The keyboard is fixed via the same method as the other simulations with the addition of console=tty on the qemu command line. Ethernet is fixed by adding a dependency of PCNET32 to the qemuppc configuration, which allows us to build ethernet directly into the image. (From OE-Core rev: 29c71eeb98aa8ce0fb0e0a30483499525bf6305d) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 11dda55..21fbce3 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -394,7 +394,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
394 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 394 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
395 QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD" 395 QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
396 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 396 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
397 KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 397 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
398 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 398 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
399 fi 399 fi
400 if [ "$FSTYPE" = "nfs" ]; then 400 if [ "$FSTYPE" = "nfs" ]; then