linux-yocto: consolidated pull request

PATCH Applied Bruce Ashfield 2 participants 8 messages Jan 11, 2012 – Jan 17, 2012

lore

Share & tools

lore

Bruce Ashfield

author

2012-01-11 19:00 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Since this is a stabilization week, this probably can't be merged immediately, but I've been working with this enough to call it good enough, and me sitting on them longer doesn't help.

The first change in this series is the switch of qemuppc from prep to mac99. With this, we'll close a whole set of issues (slow bootup) and close a feature gap that has existed for a while.

I'm seeing a bit of strangeness with the mouse in my sato testing, but that's about it. Liming hasn't seen the same issues, so getting this into the tree will allow us to incrementally improve and debug this.

The second change is a SRCREV update pulls in the forward looking fix from Khem and a fix from Zumeng that fixes a failed ltp/mm test that was found on the routerstationpro.

Cheers,

Bruce

cc Khem Raj <[email protected]>

cc Zumeng Chen <[email protected]>

cc Liming Wang <[email protected]>

The following changes since commit 18c88fcec85f96d2495457928be913807971aea7:

package.bbclass: per recipe PRSERV_HOST support (2012-01-11 10:37:43 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (1):
linux-yocto: consolidated fix SRCREV updates

Liming Wang (4):
qemuppc: replace emulation of qemuppc from prep to mac99
qemuppc: add pointercal file
qemuppc: add machconfig
tslib: enable big endian support for qemuppc

 meta/conf/machine/qemuppc.conf                     |    2 +-
 .../formfactor/files/qemuppc/machconfig            |   10 ++++++++++
 .../pointercal/files/qemuppc/pointercal            |  Bin 0 -> 36 bytes
 meta/recipes-graphics/tslib/tslib_1.0.bb           |    1 +
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   15 ++++++++-------
 scripts/runqemu                                    |    7 +------
 scripts/runqemu-internal                           |   16 ++++++++--------
 8 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100755 meta/recipes-bsp/formfactor/files/qemuppc/machconfig
 create mode 100644 meta/recipes-bsp/pointercal/files/qemuppc/pointercal

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-01-11 19:00 UTC #1 lore raw

PATCH 1/5 qemuppc: replace emulation of qemuppc from prep to mac99

From: Liming Wang <[email protected]>

With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added.

Signed-off-by Liming Wang <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/conf/machine/qemuppc.conf                  |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
 scripts/runqemu                                 |    7 +------
 scripts/runqemu-internal                        |   16 ++++++++--------
 5 files changed, 12 insertions(+), 17 deletions(-)

meta/conf/machine/qemuppc.conf +1 -1

index bcc408f..48eecb7 100644
@@ -5,7 +5,7 @@
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc
 
-KERNEL_IMAGETYPE = "zImage"
+KERNEL_IMAGETYPE = "vmlinux"
 
 SERIAL_CONSOLE = "115200 ttyS0"

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1

index c8983c4..c6bf446 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2"
 SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b"
-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c"
+SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1

index 921c258..e624b48 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"
 SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e"
 SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"
 SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"
-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c"
+SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

scripts/runqemu +1 -6

index bed6a29..ac5facf 100755
@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3
 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
 QEMUMIPS_DEFAULT_FSTYPE=ext3
 
-QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin
+QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin
 QEMUPPC_DEFAULT_FSTYPE=ext3
 
 AKITA_DEFAULT_KERNEL=zImage-akita.bin

@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; then
     fi
 fi
 
-if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then
-    echo "Error: usermode NFS boot is not available for qemuppc."
-    exit 1
-fi
-
 # FSTYPE is now set for all cases
 
 # Handle cases where a ROOTFS type is given instead of a filename, e.g.

scripts/runqemu-internal +8 -8

index 2968ed9..c55619b 100755
@@ -389,13 +389,13 @@ fi
 
 if [ "$MACHINE" = "qemuppc" ]; then
     QEMU=qemu-system-ppc
-    MACHINE_SUBTYPE=prep
-    CPU_SUBTYPE=603e
-    BIOS=powerpc_rom.bin
-    QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic"
+    MACHINE_SUBTYPE=mac99
+    CPU_SUBTYPE=G4
+    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 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
+        KERNCMDLINE="root=/dev/hda rw console=ttyS0 $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
         if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then

@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; then
             cleanup
             return
         fi
-        KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS"
+        KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
     fi
 fi

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-01-11 19:00 UTC #2 lore raw

PATCH 2/5 qemuppc: add pointercal file

In reply to Bruce Ashfield

From: Liming Wang <[email protected]>

This file is for tslib.

Signed-off-by Liming Wang <[email protected]>

---
 .../pointercal/files/qemuppc/pointercal            |  Bin 0 -> 36 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-bsp/pointercal/files/qemuppc/pointercal

meta/recipes-bsp/pointercal/files/qemuppc/pointercal new file binary +0 -0

new file mode 100644
index 0000000000000000000000000000000000000000..c2d6e37bf0c0d956ba17ba9955613c4cee5a147a
GIT binary patch

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-01-11 19:00 UTC #3 lore raw

PATCH 3/5 qemuppc: add machconfig

In reply to Bruce Ashfield

From: Liming Wang <[email protected]>

Signed-off-by Liming Wang <[email protected]>

---
 .../formfactor/files/qemuppc/machconfig            |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100755 meta/recipes-bsp/formfactor/files/qemuppc/machconfig

meta/recipes-bsp/formfactor/files/qemuppc/machconfig new file +10 -0

new file mode 100755
index 0000000..5ea2270
@@ -0,0 +1,10 @@
+HAVE_TOUCHSCREEN=1
+HAVE_KEYBOARD=1
+ 
+DISPLAY_CAN_ROTATE=0
+DISPLAY_ORIENTATION=0
+DISPLAY_WIDTH_PIXELS=800
+DISPLAY_HEIGHT_PIXELS=600
+DISPLAY_BPP=16
+DISPLAY_DPI=150
+DISPLAY_SUBPIXEL_ORDER=vrgb

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-01-11 19:00 UTC #4 lore raw

PATCH 4/5 tslib: enable big endian support for qemuppc

In reply to Bruce Ashfield

From: Liming Wang <[email protected]>

This enables wacom tablet/touchscreen support on qemuppc.

Signed-off-by Liming Wang <[email protected]>

---
 meta/recipes-graphics/tslib/tslib_1.0.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

meta/recipes-graphics/tslib/tslib_1.0.bb +1 -0

index f47116f..54ff3d4 100644
@@ -22,6 +22,7 @@ SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e"
 SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8"
 SRC_URI_append_qemumips += " file://32bitBE-support.patch"
+SRC_URI_append_qemuppc += " file://32bitBE-support.patch"
 
 
 inherit autotools pkgconfig

Signature · 1 line

1.7.4.1

Bruce Ashfield

author

2012-01-11 19:00 UTC #5 lore raw

PATCH 5/5 linux-yocto: consolidated fix SRCREV updates

In reply to Bruce Ashfield

Updating the SRCREVs to include the following fixes from Khem Raj and Zumeng Chen.

6f5b118 compiler.h: Undef before redefining __attribute_const__ fe80c1e oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |   13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

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

index c6bf446..145e548 100644
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 LINUX_VERSION ?= "3.0.14"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2"
-SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b"
+SRCREV_machine ?= "f1cc220f4ddf434bf254707c83a45794a63f117f"
+SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8"
 SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
 
 PR = "r1"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +7 -6

index e624b48..0b79bee 100644
@@ -12,12 +12,13 @@ KBRANCH = ${KMACHINE}
 
 LINUX_VERSION ?= "3.0.14"
 
-SRCREV_machine_qemuarm ?= "c498cc6e4b56784b3c2c547cb9a7af435b9412c1"
-SRCREV_machine_qemumips ?= "791c3f4124a238a798e2360340800f4989fad695"
-SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"
-SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e"
-SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"
-SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"
+
+SRCREV_machine_qemuarm ?= "c0386e4195c685b0ff94b7e21581ec47008ab13b"
+SRCREV_machine_qemumips ?= "56e4361a1bfc10042d83a7d8a5f96932056e3f35"
+SRCREV_machine_qemuppc ?= "53e71af30e30162e17e32b2f57e4481f5bc0573e"
+SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76"
+SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a"
+SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e"
 SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
 
 PR = "r2"

Signature · 1 line

1.7.4.1

Saul Wold

2012-01-13 01:23 UTC #6 lore raw

Re: [PATCH 5/5] linux-yocto: consolidated fix SRCREV updates

Quoted 41 lines · Bruce Ashfield

Updating the SRCREVs to include the following fixes from Khem Raj and Zumeng Chen.

6f5b118 compiler.h: Undef before redefining __attribute_const__ fe80c1e oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

Signed-off-by Bruce Ashfield<[email protected]>

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    4 ++--
  meta/recipes-kernel/linux/linux-yocto_3.0.bb    |   13 +++++++------
  2 files changed, 9 insertions(+), 8 deletions(-)

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

index c6bf446..145e548 100644
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
  LINUX_VERSION ?= "3.0.14"
  LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2"
-SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b"
+SRCREV_machine ?= "f1cc220f4ddf434bf254707c83a45794a63f117f"
+SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8"
  SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
 
  PR = "r1"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +0 -6

index e624b48..0b79bee 100644
@@ -12,12 +12,13 @@ KBRANCH = ${KMACHINE}
 
  LINUX_VERSION ?= "3.0.14"
 
-SRCREV_machine_qemuarm ?= "c498cc6e4b56784b3c2c547cb9a7af435b9412c1"
-SRCREV_machine_qemumips ?= "791c3f4124a238a798e2360340800f4989fad695"
-SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"
-SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e"
-SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"
-SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"

meta/recipes-kernel/linux/linux-yocto_3.0.bb KBRANCH = ${KMACHINE} · line 24

Quoted 10 lines

meta/recipes-kernel/linux/linux-yocto_3.0.bb +7 -0

+
+SRCREV_machine_qemuarm ?= "c0386e4195c685b0ff94b7e21581ec47008ab13b"
+SRCREV_machine_qemumips ?= "56e4361a1bfc10042d83a7d8a5f96932056e3f35"
+SRCREV_machine_qemuppc ?= "53e71af30e30162e17e32b2f57e4481f5bc0573e"
+SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76"
+SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a"
+SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e"
  SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
 
  PR = "r2"

Bruce, with this change I am getting the following error, I did a linux-yocto cleanall and refetched.
ERROR: Logfile of failure stored in: /intel/poky/builds/sanity/tmp/work/qemux86-poky-linux/linux-yocto-3.0.14+git9+73dafd44ea875df654129b32b2877f342d5573e4_6+9e73573b6b227ab2c62e66e63470866d136f8d76-r2/temp/log.do_validate_branches.3693 Log data follows:

| ERROR: Function 'do_validate_branches' failed (see /intel/poky/builds/sanity/tmp/work/qemux86-poky-linux/linux-yocto-3.0.14+git9+73dafd44ea875df654129b32b2877f342d5573e4_6+9e73573b6b227ab2c62e66e63470866d136f8d76-r2/temp/log.do_validate_branches.3693 for further information)
| ERROR 9e73573b6b227ab2c62e66e63470866d136f8d76 is not a valid commit ID.
| The kernel source tree may be out of sync

NOTE: package linux-yocto-3.0.14+git9+73dafd44ea875df654129b32b2877f342d5573e4_6+9e73573b6b227ab2c62e66e63470866d136f8d76-r2: task do_validate_branches: Failed
ERROR: Task 511 (/intel/poky/distro/meta/recipes-kernel/linux/linux-yocto_3.0.bb, do_validate_branches) failed with exit code '1' Waiting for 2 active tasks to finish:
0: ncurses-5.9-r4.1 do_package_write_rpm (pid 5986)
1: util-linux-2.20.1-r2 do_package (pid 5983)
Waiting for 1 active tasks to finish:
0: ncurses-5.9-r4.1 do_package_write_rpm (pid 5986)
NOTE: package util-linux-2.20.1-r2: task do_package: Succeeded
NOTE: package ncurses-5.9-r4.1: task do_package_write_rpm: Succeeded
ERROR: '/intel/poky/distro/meta/recipes-kernel/linux/linux-yocto_3.0.bb' failed
Summary: There were 6 WARNING messages shown.

Summary: There were 2 ERROR messages shown, returning a non-zero exit code.

Thanks
Sau!

Saul Wold

Applied

2012-01-17 19:37 UTC #7 lore raw

In reply to Bruce Ashfield

Quoted 53 lines · Bruce Ashfield

Richard/Saul,
Since this is a stabilization week, this probably can't be merged immediately, but I've been working with this enough to call it good enough, and me sitting on them longer doesn't help.
The first change in this series is the switch of qemuppc from prep to mac99. With this, we'll close a whole set of issues (slow bootup) and close a feature gap that has existed for a while.
I'm seeing a bit of strangeness with the mouse in my sato testing, but that's about it. Liming hasn't seen the same issues, so getting this into the tree will allow us to incrementally improve and debug this.
The second change is a SRCREV update pulls in the forward looking fix from Khem and a fix from Zumeng that fixes a failed ltp/mm test that was found on the routerstationpro.
Cheers,
Bruce
cc Khem Raj<[email protected]>
cc Zumeng Chen<[email protected]>
cc Liming Wang<[email protected]>
The following changes since commit 18c88fcec85f96d2495457928be913807971aea7:
   package.bbclass: per recipe PRSERV_HOST support (2012-01-11 10:37:43 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (1):
linux-yocto: consolidated fix SRCREV updates
Liming Wang (4):
qemuppc: replace emulation of qemuppc from prep to mac99
qemuppc: add pointercal file
qemuppc: add machconfig
tslib: enable big endian support for qemuppc
  meta/conf/machine/qemuppc.conf                     |    2 +-
  .../formfactor/files/qemuppc/machconfig            |   10 ++++++++++
  .../pointercal/files/qemuppc/pointercal            |  Bin 0 ->  36 bytes
  meta/recipes-graphics/tslib/tslib_1.0.bb           |    1 +
  meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |    6 +++---
  meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   15 ++++++++-------
  scripts/runqemu                                    |    7 +------
  scripts/runqemu-internal                           |   16 ++++++++--------
  8 files changed, 32 insertions(+), 25 deletions(-)

Quoted 3 lines

create mode 100755 meta/recipes-bsp/formfactor/files/qemuppc/machconfig create mode 100644 meta/recipes-bsp/pointercal/files/qemuppc/pointercal

Merged into OE-Core

Thanks
Sau!