Skip to contentSkip to conversation

linux-yocto/qemuppc: fix console and ethernet

PATCH Applied Bruce Ashfield 2 participants 4 messages Jan 23, 2012 – Jan 24, 2012

lore
Share & tools
lore
#0 lore raw

cover linux-yocto/qemuppc: fix console and ethernet

Richard/Saul,

As was discussed on the mailing list ethernet wasn't working out of the box on the 3.0 kernel (but it was in 3.2, hence why my boots missed it). I bundled this together with a console fix.

The commit says it all:

[
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.
]

Cheers,

Bruce

The following changes since commit 4ad01bdf3f9cea8b2f42b925fa2b644d96ba1a82:
Richard Purdie (1):
gcc-package-cross.inc: Mark do_package* tasks as noexec

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/qemuppc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/qemuppc

Bruce Ashfield (1):
linux-yocto/qemuppc: fix console and ethernet

 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
 scripts/runqemu-internal                        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
#1 lore raw

PATCH 1/1 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.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
 scripts/runqemu-internal                        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1
index 145e548..9a543ab 100644
@@ -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}"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index 0b79bee..10859e7 100644
@@ -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}"
scripts/runqemu-internal +1 -1
index 11dda55..21fbce3 100755
@@ -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
Signature · 1 line
1.7.0.4
#2 lore raw
Quoted 10 lines · Bruce Ashfield

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.

Quoted 6 lines
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
 scripts/runqemu-internal                        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

I can confirm qemuppc now has networking as well as graphics which is great progress :)

Cheers,

Richard

#3 lore raw
Quoted 18 lines · Richard Purdie
Quoted 10 lines · Bruce Ashfield

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.

Quoted 6 lines
---
  meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
  meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
  scripts/runqemu-internal                        |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
Quoted 4 lines

Merged to master, thanks.

I can confirm qemuppc now has networking as well as graphics which is great progress :)

Indeed! It is nice to close out this longstanding issue.

Cheers,

Bruce

Quoted 5 lines

Cheers,

Richard