sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Bruce Ashfield 2012-01-23 12:54:32 -05:00 committed by Richard Purdie
parent c47def3b04
commit 21b3f5ddb1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
View File

@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "f1cc220f4ddf434bf254707c83a45794a63f117f"
SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8"
SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
SRCREV_meta ?= "665fea1c249b4f335cb1c9a46a9f2c138d611f1a"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"

2
meta/recipes-kernel/linux/linux-yocto_3.0.bb
View File

@ -19,7 +19,7 @@ SRCREV_machine_qemuppc ?= "53e71af30e30162e17e32b2f57e4481f5bc0573e"
SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76"
SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a"
SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e"
SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
SRCREV_meta ?= "665fea1c249b4f335cb1c9a46a9f2c138d611f1a"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"

2
scripts/runqemu-internal
View File

@ -394,7 +394,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
fi
if [ "$FSTYPE" = "nfs" ]; then