[PATCH 0/4] meta-yocto-bsp: 3.10 updates

[PATCH 0/4] meta-yocto-bsp: 3.10 updates

[Bruce Ashfield]

Richard/Saul,

Here's the last set of updates on the heels of the 3.10
stabilization.

I realize that these are later than I wanted to send them,
but with other issues around 3.10, it didn't make sense
to pile them on.

They are kernel version uprevs, but there are a number of
ourstanding bugs on all the boards that make no sense to
fix on 3.4. With this, we do take the risk of new bugs, but
the newer kernel fixes a lot, and hopefully breaks very
little.

Also with this, we have all reference BSPs on 3.10!

So here they are, tested locall and by the Wind River 
BSP team.

Cheers,

Bruce


The following changes since commit fc8a99ffc3974a5cb2b6d12a5a95d019f15c5f22:

  kern-tools: support no author patches (2013-09-06 00:14:11 -0400)

are available in the git repository at:

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

Bruce Ashfield (2):
  meta-yocto-bsp: update h/w reference boards SRCREVs
  linux-yocto/3.10: update meta SRCREV for beagleboard config changes

Kevin Hao (1):
  mpc8315e-rdb: update to the 3.10 kernel

Liming Wang (1):
  beagleboard: upgrade the kernel to 3.10.x

 meta-yocto-bsp/conf/machine/beagleboard.conf                 |    5 +++--
 meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf                |    2 +-
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend           |   10 +++++-----
 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 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

-- 
1.7.10.4

[PATCH 1/4] mpc8315e-rdb: update to the 3.10 kernel

[Bruce Ashfield]

From: Kevin Hao <kexin.hao@windriver.com>

Update the mpc8315e-rdb to the latest available yocto kernel.
Build and boot test on mpc8315e-rdb board with core-image-sato.

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index 3e984a7..ab1eaa9 100644
--- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
@@ -14,7 +14,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
 
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_VERSION_linux-yocto ?= "3.10%"
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
 
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-- 
1.7.10.4

[PATCH 2/4] meta-yocto-bsp: update h/w reference boards SRCREVs

[Bruce Ashfield]

Updating the machine SRCREVs for the hardware reference boards to the
latest 3.10.10 and ssh fixes.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend           |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
index c3968ef..4391c0f 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -7,11 +7,11 @@ KBRANCH_beagleboard = "standard/beagleboard"
 KMACHINE_genericx86 ?= "common-pc"
 KMACHINE_genericx86-64 ?= "common-pc-64"
 
-SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
-SRCREV_machine_genericx86-64 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
-SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79"
-SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a"
-SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
+SRCREV_machine_genericx86 ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
+SRCREV_machine_genericx86-64 ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
+SRCREV_machine_routerstationpro ?= "80d9c863208fba7d8af6afe7b9167808635a56c0"
+SRCREV_machine_mpc8315e-rdb ?= "b9b4bf71249ac7a24420913aa90f7ba75578d5a5"
+SRCREV_machine_beagleboard ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
 
 COMPATIBLE_MACHINE_genericx86 = "genericx86"
 COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
-- 
1.7.10.4

[PATCH 3/4] beagleboard: upgrade the kernel to 3.10.x

[Bruce Ashfield]

From: Liming Wang <liming.wang@windriver.com>

In 3.10.x linux kernel, uImage can't be compiled by default. But zImage
has been supported by the latest u-boot, so use zImage as the default kernel
image file. In u-boot command, use "bootz", instead of "bootm", to boot the kernel.

And add device tree files to support dtb in latest kernel.

Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto-bsp/conf/machine/beagleboard.conf |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
index 5f4c55a..dd0c222 100644
--- a/meta-yocto-bsp/conf/machine/beagleboard.conf
+++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
@@ -29,9 +29,10 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 SERIAL_CONSOLE = "115200 ttyO2"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_VERSION_linux-yocto ?= "3.10%"
 
-KERNEL_IMAGETYPE = "uImage"
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/omap3-beagle.dts ${S}/arch/powerpc/boot/dts/omap3-beagle-xm.dts"
 
 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
-- 
1.7.10.4

Re: [PATCH 3/4] beagleboard: upgrade the kernel to 3.10.x

[Anders Darander]

* Bruce Ashfield <bruce.ashfield@windriver.com> [130906 22:59]:
> From: Liming Wang <liming.wang@windriver.com>

> In 3.10.x linux kernel, uImage can't be compiled by default. But zImage
> has been supported by the latest u-boot, so use zImage as the default kernel
> image file. In u-boot command, use "bootz", instead of "bootm", to boot the kernel.

NAK. (At least based on the info given above regarding the uImage to
zImage transfer).

I missed this patch earlier... 

What's the issue with uImage on 3.10.x?
I'm running a kernel.org 3.10.x using linux-yocto-custom just fine here
(although for another board).

I suspect the issue (that I guess Liming had), is due to the powerpc
being mixed into his build. (Bruce replied on the oe-core list to a
path which corrected the path to the DTS).

Cheers,
Anders

> And add device tree files to support dtb in latest kernel.

> Signed-off-by: Liming Wang <liming.wang@windriver.com>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta-yocto-bsp/conf/machine/beagleboard.conf |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

> diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
> index 5f4c55a..dd0c222 100644
> --- a/meta-yocto-bsp/conf/machine/beagleboard.conf
> +++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
> @@ -29,9 +29,10 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
>  SERIAL_CONSOLE = "115200 ttyO2"

>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
> -PREFERRED_VERSION_linux-yocto ?= "3.4%"
> +PREFERRED_VERSION_linux-yocto ?= "3.10%"

> -KERNEL_IMAGETYPE = "uImage"
> +KERNEL_IMAGETYPE = "zImage"
> +KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/omap3-beagle.dts ${S}/arch/powerpc/boot/dts/omap3-beagle-xm.dts"

>  SPL_BINARY = "MLO"
>  UBOOT_SUFFIX = "img"
-- 
Anders Darander
ChargeStorm AB / eStorm AB

Re: [PATCH 3/4] beagleboard: upgrade the kernel to 3.10.x

[Bruce Ashfield]

On 13-09-10 04:08 AM, Anders Darander wrote:
> * Bruce Ashfield <bruce.ashfield@windriver.com> [130906 22:59]:
>> From: Liming Wang <liming.wang@windriver.com>
>
>> In 3.10.x linux kernel, uImage can't be compiled by default. But zImage
>> has been supported by the latest u-boot, so use zImage as the default kernel
>> image file. In u-boot command, use "bootz", instead of "bootm", to boot the kernel.
>
> NAK. (At least based on the info given above regarding the uImage to
> zImage transfer).
>
> I missed this patch earlier...
>
> What's the issue with uImage on 3.10.x?
> I'm running a kernel.org 3.10.x using linux-yocto-custom just fine here
> (although for another board).
>
> I suspect the issue (that I guess Liming had), is due to the powerpc
> being mixed into his build. (Bruce replied on the oe-core list to a
> path which corrected the path to the DTS).

No, that wasn't the issue. uImage requires a LOADADDR in many cases and
that isn't currently encoded in the machine configs.

zImage works fine, want to expand our coverage with the reference boards,
so no, there's no NAK of this. It's fine as is.

Other layers and BSPs are free to use uImage, just as this reference
is free to use the zImage.

Bruce

>
> Cheers,
> Anders
>
>> And add device tree files to support dtb in latest kernel.
>
>> Signed-off-by: Liming Wang <liming.wang@windriver.com>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>   meta-yocto-bsp/conf/machine/beagleboard.conf |    5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>
>> diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
>> index 5f4c55a..dd0c222 100644
>> --- a/meta-yocto-bsp/conf/machine/beagleboard.conf
>> +++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
>> @@ -29,9 +29,10 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
>>   SERIAL_CONSOLE = "115200 ttyO2"
>
>>   PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
>> -PREFERRED_VERSION_linux-yocto ?= "3.4%"
>> +PREFERRED_VERSION_linux-yocto ?= "3.10%"
>
>> -KERNEL_IMAGETYPE = "uImage"
>> +KERNEL_IMAGETYPE = "zImage"
>> +KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/omap3-beagle.dts ${S}/arch/powerpc/boot/dts/omap3-beagle-xm.dts"
>
>>   SPL_BINARY = "MLO"
>>   UBOOT_SUFFIX = "img"

Re: [PATCH 3/4] beagleboard: upgrade the kernel to 3.10.x

[Bruce Ashfield]

On 13-09-10 04:16 AM, Bruce Ashfield wrote:
> On 13-09-10 04:08 AM, Anders Darander wrote:
>> * Bruce Ashfield <bruce.ashfield@windriver.com> [130906 22:59]:
>>> From: Liming Wang <liming.wang@windriver.com>
>>
>>> In 3.10.x linux kernel, uImage can't be compiled by default. But zImage
>>> has been supported by the latest u-boot, so use zImage as the default
>>> kernel
>>> image file. In u-boot command, use "bootz", instead of "bootm", to
>>> boot the kernel.
>>
>> NAK. (At least based on the info given above regarding the uImage to
>> zImage transfer).
>>
>> I missed this patch earlier...
>>
>> What's the issue with uImage on 3.10.x?
>> I'm running a kernel.org 3.10.x using linux-yocto-custom just fine here
>> (although for another board).
>>
>> I suspect the issue (that I guess Liming had), is due to the powerpc
>> being mixed into his build. (Bruce replied on the oe-core list to a
>> path which corrected the path to the DTS).
>
> No, that wasn't the issue. uImage requires a LOADADDR in many cases and
> that isn't currently encoded in the machine configs.

I forgot to add that if QA shows issues with this change, then obviously,
I'll revisit the image format default.

Bruce

>
> zImage works fine, want to expand our coverage with the reference boards,
> so no, there's no NAK of this. It's fine as is.
>
> Other layers and BSPs are free to use uImage, just as this reference
> is free to use the zImage.
>
> Bruce
>
>>
>> Cheers,
>> Anders
>>
>>> And add device tree files to support dtb in latest kernel.
>>
>>> Signed-off-by: Liming Wang <liming.wang@windriver.com>
>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> ---
>>>   meta-yocto-bsp/conf/machine/beagleboard.conf |    5 +++--
>>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>>> diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf
>>> b/meta-yocto-bsp/conf/machine/beagleboard.conf
>>> index 5f4c55a..dd0c222 100644
>>> --- a/meta-yocto-bsp/conf/machine/beagleboard.conf
>>> +++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
>>> @@ -29,9 +29,10 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
>>>   SERIAL_CONSOLE = "115200 ttyO2"
>>
>>>   PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
>>> -PREFERRED_VERSION_linux-yocto ?= "3.4%"
>>> +PREFERRED_VERSION_linux-yocto ?= "3.10%"
>>
>>> -KERNEL_IMAGETYPE = "uImage"
>>> +KERNEL_IMAGETYPE = "zImage"
>>> +KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/omap3-beagle.dts
>>> ${S}/arch/powerpc/boot/dts/omap3-beagle-xm.dts"
>>
>>>   SPL_BINARY = "MLO"
>>>   UBOOT_SUFFIX = "img"
>

Re: [PATCH 3/4] beagleboard: upgrade the kernel to 3.10.x

[Anders Darander]

* Bruce Ashfield <bruce.ashfield@windriver.com> [130910 10:16]:

> On 13-09-10 04:08 AM, Anders Darander wrote:
> > * Bruce Ashfield <bruce.ashfield@windriver.com> [130906 22:59]:
> >> From: Liming Wang <liming.wang@windriver.com>

> >> In 3.10.x linux kernel, uImage can't be compiled by default. But zImage
> >> has been supported by the latest u-boot, so use zImage as the default kernel
> >> image file. In u-boot command, use "bootz", instead of "bootm", to boot the kernel.

> > NAK. (At least based on the info given above regarding the uImage to
> > zImage transfer).

> > I missed this patch earlier...

> > What's the issue with uImage on 3.10.x?
> > I'm running a kernel.org 3.10.x using linux-yocto-custom just fine here
> > (although for another board).

> > I suspect the issue (that I guess Liming had), is due to the powerpc
> > being mixed into his build. (Bruce replied on the oe-core list to a
> > path which corrected the path to the DTS).

> No, that wasn't the issue. uImage requires a LOADADDR in many cases and
> that isn't currently encoded in the machine configs.

Ah, ok. Then I'll obviously redraw my NAK-wishes for this patch.

I think the reason that uImage can't be compiled should have been stated
in the commit log, though. If for nothing else, just to make it clear to
everyone that there's no general uImage issue; rather an issue with the
specific board setup.

Cheers,
Anders

> zImage works fine, want to expand our coverage with the reference boards,
> so no, there's no NAK of this. It's fine as is.

> Other layers and BSPs are free to use uImage, just as this reference
> is free to use the zImage.


-- 
Anders Darander
ChargeStorm AB / eStorm AB

Re: [PATCH 3/4] beagleboard: upgrade the kernel to 3.10.x

[Bruce Ashfield]

On 13-09-10 04:36 AM, Anders Darander wrote:
> * Bruce Ashfield <bruce.ashfield@windriver.com> [130910 10:16]:
>
>> On 13-09-10 04:08 AM, Anders Darander wrote:
>>> * Bruce Ashfield <bruce.ashfield@windriver.com> [130906 22:59]:
>>>> From: Liming Wang <liming.wang@windriver.com>
>
>>>> In 3.10.x linux kernel, uImage can't be compiled by default. But zImage
>>>> has been supported by the latest u-boot, so use zImage as the default kernel
>>>> image file. In u-boot command, use "bootz", instead of "bootm", to boot the kernel.
>
>>> NAK. (At least based on the info given above regarding the uImage to
>>> zImage transfer).
>
>>> I missed this patch earlier...
>
>>> What's the issue with uImage on 3.10.x?
>>> I'm running a kernel.org 3.10.x using linux-yocto-custom just fine here
>>> (although for another board).
>
>>> I suspect the issue (that I guess Liming had), is due to the powerpc
>>> being mixed into his build. (Bruce replied on the oe-core list to a
>>> path which corrected the path to the DTS).
>
>> No, that wasn't the issue. uImage requires a LOADADDR in many cases and
>> that isn't currently encoded in the machine configs.
>
> Ah, ok. Then I'll obviously redraw my NAK-wishes for this patch.
>
> I think the reason that uImage can't be compiled should have been stated
> in the commit log, though. If for nothing else, just to make it clear to
> everyone that there's no general uImage issue; rather an issue with the
> specific board setup.

We can do that. I also re-opened the bugzilla so it can be used for making
sure this is clear.

Bruce

>
> Cheers,
> Anders
>
>> zImage works fine, want to expand our coverage with the reference boards,
>> so no, there's no NAK of this. It's fine as is.
>
>> Other layers and BSPs are free to use uImage, just as this reference
>> is free to use the zImage.
>
>

[PATCH 4/4] linux-yocto/3.10: update meta SRCREV for beagleboard config changes

[Bruce Ashfield]

Updating the beagleboard configuration to match the 3.10 kernel changes.
With this, the beagle* boards boot out of the box, with no additional
changes required.

Simarpreet Singh <simar@linux.com>
Signed-off-by: Liming Wang <liming.wang@windriver.com>
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 a2e0310..a4366d0 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 ?= "38793e629654f6b3e3f371a6b1f1745df26450f4"
 SRCREV_machine_qemuppc ?= "d4c836c55fce6f1a7f299bba2104f457b201c63d"
-SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
+SRCREV_meta ?= "ea900d1db60ba48962227f0976ac55f9e25bfa24"
 
 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 8b3dbe0..b3457b3 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.10"
 KMETA = "meta"
 
 SRCREV_machine ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
-SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
+SRCREV_meta ?= "ea900d1db60ba48962227f0976ac55f9e25bfa24"
 
 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 2de1798..e570cd6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -10,7 +10,7 @@ SRCREV_machine_qemux86 ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
 SRCREV_machine_qemux86-64 ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
 SRCREV_machine_qemumips64 ?= "ebc55bed9558a0e2f390e9cef03161b299138326"
 SRCREV_machine ?= "ebc8428fdd938cfdfcdcadd77c3308ece6a57de1"
-SRCREV_meta ?= "cd502a88148ab214b54860f97a96f41858fd6446"
+SRCREV_meta ?= "ea900d1db60ba48962227f0976ac55f9e25bfa24"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
1.7.10.4