Patchwork [2/2] linux-yocto/3.10: integrate LTSI

login
register
mail settings
Submitter Bruce Ashfield
Date Feb. 7, 2014, 7:22 p.m.
Message ID <52F5328A.7090606@windriver.com>
Download mbox | patch
Permalink /patch/66497/
State New
Headers show

Comments

Bruce Ashfield - Feb. 7, 2014, 7:22 p.m.
The 32 bit qemu BSP needs powermanagement .. it's a kernel bug, but
can fix it via a config change.

I've attached the fix.

Bruce

On 14-02-07 11:42 AM, Saul Wold wrote:
> On 02/04/2014 09:34 AM, Bruce Ashfield wrote:
>> Updating the SRCREVs of the 3.10 tree to reflect the integration of
>> of commit 68054859 from:
>>
>>
>> git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/ltsi-kernel.git
>>
>>
>> Build and boot tested on all qemu architectures.
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>   meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   |  4 ++--
>>   meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb |  2 +-
>>   meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 14 +++++++-------
>>   3 files changed, 10 insertions(+), 10 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
>> b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
>> index 9bdd47ecbf65..dd1ec52626d1 100644
>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
>> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
>> @@ -3,8 +3,8 @@ require recipes-kernel/linux/linux-yocto.inc
>>   KBRANCH = "standard/preempt-rt/base"
>>   KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
>>
>> -SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
>> -SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
>> +SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
>> +SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
>>   SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
>>
>>   SRC_URI =
>> "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
>>
>> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
>> b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
>> index 6defed1c9464..a852f75ff443 100644
>> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
>> +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
>> @@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.25"
>>
>>   KMETA = "meta"
>>
>> -SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
>> +SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
>>   SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
>>
>>   PV = "${LINUX_VERSION}+git${SRCPV}"
>> diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
>> b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
>> index d0772fddc5f1..f7f4dabea8d5 100644
>> --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
>> +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
>> @@ -11,13 +11,13 @@ KBRANCH_qemux86  = "standard/common-pc/base"
>>   KBRANCH_qemux86-64  = "standard/common-pc-64/base"
>>   KBRANCH_qemumips64 = "standard/mti-malta64"
>>
>> -SRCREV_machine_qemuarm ?= "e3163012f3e09fe48374ef22bc676f8b19aeec1a"
>> -SRCREV_machine_qemumips ?= "01a71aaf8e545c3ef88da1fe02f53d1b96a2640e"
>> -SRCREV_machine_qemuppc ?= "ae1b9115975ff235038d5da22b4cc984b4d76aae"
>> -SRCREV_machine_qemux86 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
>> -SRCREV_machine_qemux86-64 ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
>> -SRCREV_machine_qemumips64 ?= "67efb2993ec7726df5567e2572fd64e34e29b46d"
>> -SRCREV_machine ?= "79af968f2f26378798aec7a6d729ff5a371aae5f"
>> +SRCREV_machine_qemuarm ?= "2a4d8c0884c8d08896c052a6e42c51e861cf48b5"
>> +SRCREV_machine_qemumips ?= "08872a160571b9bf45b6cd262b977063f12aca46"
>> +SRCREV_machine_qemuppc ?= "eba0c4fcc962ffddd384251b5b6ee0c61bd5ea4d"
>> +SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
>> +SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
>> +SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
>> +SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
>>   SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
>>
>>   SRC_URI =
>> "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
>>
>>
>
> This change seems to have introduced an issue with the x86* builds as
> follows:
>> | drivers/built-in.o: In function `gen6_update_ring_freq':
>> |
>> /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3876:
>> undefined reference to `cpufreq_cpu_get'
>> |
>> /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/linux/drivers/gpu/drm/i915/intel_pm.c:3879:
>> undefined reference to `cpufreq_cpu_put'
>> | make[2]: *** [vmlinux] Error 1
>> | make[1]: *** [sub-make] Error 2
>> | make: *** [all] Error 2
>> | ERROR: oe_runmake failed
>> | WARNING:
>> /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/run.do_compile.1426:1
>> exit 1 from
>> |   exit 1
>> | ERROR: Function failed: do_compile (log file is located at
>> /home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/build/tmp/work/qemux86-poky-linux/linux-yocto/3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0/temp/log.do_compile.1426)
>>
>> NOTE: recipe linux-yocto-3.10.25+gitAUTOINC+4d658aa580_78d2a615b1-r0:
>> task do_compile: Failed
>> ERROR: Task 149
>> (/home/pokybuild/yocto-autobuilder-dev/yocto-slave/nightly-x86/build/meta/recipes-kernel/linux/linux-yocto_3.10.bb,
>> do_compile) failed with exit code '1'
>> NOTE: recipe gcc-runtime-4.8.2-r0: task do_compile: Succeeded
>
> This can be seen on the AB
> http://autobuilder.yoctoproject.org/main/builders/nightly-x86/builds/20/steps/BuildImages/logs/stdio
>
>
> This is one example.
>
> Thanks
>      Sau!
>
>

Patch

From 3826d38f8e8fc9a98b321bfda6d8bdfedb26be12 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Fri, 7 Feb 2014 14:04:51 -0500
Subject: [PATCH] linux-yocto/3.10: add powermanagement config to 32 bit
 common-pc

The introduction of LTSI has exposed a missing dependency on cpufreq
being enabled. To fix the build, we enable power management in the
32 bit BSP, which aligns it with 64 bit.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_3.10.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index dd1ec52626d1..fa6415aa4f42 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -5,7 +5,7 @@  KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
 SRCREV_machine ?= "14651317755a87f03f8399299f2eb0b4042a2d0c"
 SRCREV_machine_qemuppc ?= "2918b5d9ee82304d67aae61a427fcb02d3edee8f"
-SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index a852f75ff443..923f9123322b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -10,7 +10,7 @@  LINUX_VERSION ?= "3.10.25"
 KMETA = "meta"
 
 SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
-SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index f7f4dabea8d5..8b90d6b5ed5d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -18,7 +18,7 @@  SRCREV_machine_qemux86 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
 SRCREV_machine_qemux86-64 ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
 SRCREV_machine_qemumips64 ?= "de555074575d2997a8cd7a4b2d6dbf22e7ddfc9b"
 SRCREV_machine ?= "78d2a615b13a1c307d482eaa9499c1b2dee40599"
-SRCREV_meta ?= "4d658aa580df62232a4a84957b02496436dc17c4"
+SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
1.8.1.2