Patchwork [fsl-community-bsp-platform] 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, 1:58 p.m.
Message ID <1367243931-20854-1-git-send-email-Mahesh.Mahadevan@freescale.com>
Download mbox | patch
Permalink /patch/49057/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Mahesh Mahadevan - April 29, 2013, 1:58 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(-)
Fabio Estevam - April 29, 2013, 2:05 p.m.
On Mon, Apr 29, 2013 at 10:58 AM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:

> -# 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 = "+yocto"

Should't this be:

# Revision of imx_2.6.35_maintain branch
SRCREV_mx28 = "a8e0615aab26a69b306c50d27409d732869e6609"
SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
LOCALVERSION_mx28 = "-maintain-branch+yocto"
LOCALVERSION_mx5 = "-maintain-branch+yocto"

as we do not use this branch for mx23?

Otavio?
Mahadevan Mahesh-R9AADQ - April 29, 2013, 2:15 p.m.
Isn't the compatible machine limited to MX28 & MX5.

Best regards,
-Mahesh

-----Original Message-----
From: Fabio Estevam [mailto:festevam@gmail.com] 
Sent: Monday, April 29, 2013 9:05 AM
To: Mahadevan Mahesh-R9AADQ
Cc: meta-freescale@yoctoproject.org; Otavio Salvador
Subject: Re: [meta-freescale] [fsl-community-bsp-platform][PATCH] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

On Mon, Apr 29, 2013 at 10:58 AM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:

> -# 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 = "+yocto"

Should't this be:

# Revision of imx_2.6.35_maintain branch
SRCREV_mx28 = "a8e0615aab26a69b306c50d27409d732869e6609"
SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
LOCALVERSION_mx28 = "-maintain-branch+yocto"
LOCALVERSION_mx5 = "-maintain-branch+yocto"

as we do not use this branch for mx23?

Otavio?
Daiane Angolini - April 29, 2013, 2:29 p.m.
On 04/29/2013 11:05 AM, Fabio Estevam wrote:
> On Mon, Apr 29, 2013 at 10:58 AM, Mahesh Mahadevan
> <Mahesh.Mahadevan@freescale.com> wrote:
>
>> -# 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 = "+yocto"
>
> Should't this be:
>
> # Revision of imx_2.6.35_maintain branch
> SRCREV_mx28 = "a8e0615aab26a69b306c50d27409d732869e6609"
> SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
> LOCALVERSION_mx28 = "-maintain-branch+yocto"
> LOCALVERSION_mx5 = "-maintain-branch+yocto"

I prefer

LOCALVERSION_mx28 = "-imx_2.6.35_maintain+yocto"
LOCALVERSION_mx5 = "-imx_2.6.35_maintain+yocto"

if possible.

Daiane
Otavio Salvador - April 29, 2013, 2:57 p.m.
On Mon, Apr 29, 2013 at 11:05 AM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Apr 29, 2013 at 10:58 AM, Mahesh Mahadevan
> <Mahesh.Mahadevan@freescale.com> wrote:
>
>> -# 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 = "+yocto"
>
> Should't this be:
>
> # Revision of imx_2.6.35_maintain branch
> SRCREV_mx28 = "a8e0615aab26a69b306c50d27409d732869e6609"
> SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
> LOCALVERSION_mx28 = "-maintain-branch+yocto"
> LOCALVERSION_mx5 = "-maintain-branch+yocto"
>
> as we do not use this branch for mx23?

We moved mx23 to 3.8, do you recall? You sent the patch for it :-)

--
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
Otavio Salvador - April 29, 2013, 2:58 p.m.
On Mon, Apr 29, 2013 at 11:29 AM, Daiane Angolini
<daiane.angolini@freescale.com> wrote:
> On 04/29/2013 11:05 AM, Fabio Estevam wrote:
>>
>> On Mon, Apr 29, 2013 at 10:58 AM, Mahesh Mahadevan
>> <Mahesh.Mahadevan@freescale.com> wrote:
>>
>>> -# 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 = "+yocto"
>>
>>
>> Should't this be:
>>
>> # Revision of imx_2.6.35_maintain branch
>> SRCREV_mx28 = "a8e0615aab26a69b306c50d27409d732869e6609"
>> SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
>> LOCALVERSION_mx28 = "-maintain-branch+yocto"
>> LOCALVERSION_mx5 = "-maintain-branch+yocto"
>
>
> I prefer
>
> LOCALVERSION_mx28 = "-imx_2.6.35_maintain+yocto"
> LOCALVERSION_mx5 = "-imx_2.6.35_maintain+yocto"
>
> if possible.

It is possible but I find it ugly. The kernel version itself is 2.6.35
so the string will be longer and duplicate information ...

Personally I prefer Mahesh patch as is.

--
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
Otavio Salvador - April 29, 2013, 3:01 p.m.
On Mon, Apr 29, 2013 at 10:58 AM, 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>

I will wait Daiane and Fabio agreement on this before pushing it but
as a general comment, please pay attention to the prefix you use in
the format-patch. This patch is for meta-fsl-arm, not
fsl-community-bsp-platform (which is used for repo manifest).

--
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 29, 2013, 3:01 p.m.
On Mon, Apr 29, 2013 at 11:57 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:

>> as we do not use this branch for mx23?
>
> We moved mx23 to 3.8, do you recall? You sent the patch for it :-)

Sure, that's exactly why I am asking it.

In the review process you asked me to use:

SRCREV_mx28
LOCALVERSION_mx28

so that mx23 does not use this branch anymore.

So is it safe to drop _mx28 now?
Otavio Salvador - April 29, 2013, 3:03 p.m.
On Mon, Apr 29, 2013 at 12:01 PM, Fabio Estevam <festevam@gmail.com> wrote:
> On Mon, Apr 29, 2013 at 11:57 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>
>>> as we do not use this branch for mx23?
>>
>> We moved mx23 to 3.8, do you recall? You sent the patch for it :-)
>
> Sure, that's exactly why I am asking it.
>
> In the review process you asked me to use:
>
> SRCREV_mx28
> LOCALVERSION_mx28
>
> so that mx23 does not use this branch anymore.
>
> So is it safe to drop _mx28 now?

Yes as it won't have other revision and /all/ machines (from mx28 and
mx5) so a single revision and localversion setting works just fine.

--
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

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..66ecf72 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 = "+yocto"
 
 SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \