Patchwork [meta-fsl-arm] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

login
register
mail settings
Submitter Mahesh Mahadevan
Date April 29, 2013, 3:10 p.m.
Message ID <1367248246-21713-1-git-send-email-Mahesh.Mahadevan@freescale.com>
Download mbox | patch
Permalink /patch/49065/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Mahesh Mahadevan - April 29, 2013, 3:10 p.m.
Update to the latest code available from Freescale's GIT repository.
This patch makes MX28 and MX5 series work from the same 2.6.35
code-base

Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
---
 recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
Otavio Salvador - April 30, 2013, 5:34 p.m.
On Mon, Apr 29, 2013 at 12:10 PM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:
> Update to the latest code available from Freescale's GIT repository.
> This patch makes MX28 and MX5 series work from the same 2.6.35
> code-base
>
> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>

...
> +# Revision of imx_2.6.35_maintain branch
> +SRCREV = "a8e0615aab26a69b306c50d27409d732869e6609"
> +LOCALVERSION = "-imx_2.6.35_maintain+yocto"
...

Daiane, do you really want the duplicated kernel version here? I'd
prefer as initial Mahesh proposal with 'maintain+yocto' only.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Fabio Estevam - April 30, 2013, 5:42 p.m.
On Tue, Apr 30, 2013 at 2:34 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Apr 29, 2013 at 12:10 PM, Mahesh Mahadevan
> <Mahesh.Mahadevan@freescale.com> wrote:
>> Update to the latest code available from Freescale's GIT repository.
>> This patch makes MX28 and MX5 series work from the same 2.6.35
>> code-base
>>
>> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
>
> ...
>> +# Revision of imx_2.6.35_maintain branch
>> +SRCREV = "a8e0615aab26a69b306c50d27409d732869e6609"
>> +LOCALVERSION = "-imx_2.6.35_maintain+yocto"
> ...
>
> Daiane, do you really want the duplicated kernel version here? I'd
> prefer as initial Mahesh proposal with 'maintain+yocto' only.

2.6.35.3-imx_2.6.35_maintain+yocto is too long and redundant my opinion.

Only adding '-maintain+yocto' will look better.
Daiane Angolini - April 30, 2013, 6:04 p.m.
On 04/30/2013 02:34 PM, Otavio Salvador wrote:
> On Mon, Apr 29, 2013 at 12:10 PM, Mahesh Mahadevan
> <Mahesh.Mahadevan@freescale.com> wrote:
>> Update to the latest code available from Freescale's GIT repository.
>> This patch makes MX28 and MX5 series work from the same 2.6.35
>> code-base
>>
>> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
>
> ...
>> +# Revision of imx_2.6.35_maintain branch
>> +SRCREV = "a8e0615aab26a69b306c50d27409d732869e6609"
>> +LOCALVERSION = "-imx_2.6.35_maintain+yocto"
> ...
>
> Daiane, do you really want the duplicated kernel version here? I'd
> prefer as initial Mahesh proposal with 'maintain+yocto' only.
>

No

go ahead

Patch

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 072a5ce..80956b6 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,19 +1,15 @@ 
-# Copyright (C) 2011-2012 Freescale Semiconductor
+# Copyright (C) 2011-2013 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-PR = "${INC_PR}.23"
+PR = "${INC_PR}.24"
 
 include linux-imx.inc
 
 COMPATIBLE_MACHINE = "(mx28|mx5)"
 
-# Revision of imx_2.6.35_1.1.0 branch
-SRCREV_mx28 = "914558e17e95a55ac1eac9a6c219d17d7825f715"
-LOCALVERSION_mx28 = "-1.1.0+yocto"
-
-# Revision of imx_2.6.35_11.09.01 branch
-SRCREV_mx5 = "ed51f22bea310805bfdcc1be236cc56ff0832b3a"
-LOCALVERSION_mx5 = "-11.09.01+yocto"
+# Revision of imx_2.6.35_maintain branch
+SRCREV = "a8e0615aab26a69b306c50d27409d732869e6609"
+LOCALVERSION = "-imx_2.6.35_maintain+yocto"
 
 SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \