[U-Boot,1/5] ARM: mxs: Sort the mx23evk and mx23_olinuxino

Submitted by Marek Vasut on Aug. 31, 2013, 1:53 p.m.

Details

Message ID 1377957226-31010-1-git-send-email-marex@denx.de
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Marek Vasut Aug. 31, 2013, 1:53 p.m.
These boards were not sortes in the boards.cfg, fix this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
---
 boards.cfg |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Otavio Salvador Aug. 31, 2013, 6:48 p.m.
On Sat, Aug 31, 2013 at 10:53 AM, Marek Vasut <marex@denx.de> wrote:
> These boards were not sortes in the boards.cfg, fix this.
>
> Signed-off-by: Marek Vasut <marex@denx.de>

I think this patch is not need as boards.cfg is being reworked.
Marek Vasut Aug. 31, 2013, 6:51 p.m.
Dear Otavio Salvador,

> On Sat, Aug 31, 2013 at 10:53 AM, Marek Vasut <marex@denx.de> wrote:
> > These boards were not sortes in the boards.cfg, fix this.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> 
> I think this patch is not need as boards.cfg is being reworked.

This patch is needed as it fixes inconsistency your previous patch introduced.

Best regards,
Marek Vasut
Otavio Salvador Aug. 31, 2013, 7:03 p.m.
On Sat, Aug 31, 2013 at 3:51 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> On Sat, Aug 31, 2013 at 10:53 AM, Marek Vasut <marex@denx.de> wrote:
>> > These boards were not sortes in the boards.cfg, fix this.
>> >
>> > Signed-off-by: Marek Vasut <marex@denx.de>
>>
>> I think this patch is not need as boards.cfg is being reworked.
>
> This patch is needed as it fixes inconsistency your previous patch introduced.

I agree with the patch; I just think we must get the boards file
rework merged as soon as possible or we'll keep generating conflicts
for it.
Marek Vasut Aug. 31, 2013, 7:51 p.m.
Dear Otavio Salvador,

> On Sat, Aug 31, 2013 at 3:51 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Otavio Salvador,
> > 
> >> On Sat, Aug 31, 2013 at 10:53 AM, Marek Vasut <marex@denx.de> wrote:
> >> > These boards were not sortes in the boards.cfg, fix this.
> >> > 
> >> > Signed-off-by: Marek Vasut <marex@denx.de>
> >> 
> >> I think this patch is not need as boards.cfg is being reworked.
> > 
> > This patch is needed as it fixes inconsistency your previous patch
> > introduced.
> 
> I agree with the patch; I just think we must get the boards file
> rework merged as soon as possible or we'll keep generating conflicts
> for it.

What rework are you talking about ?

Best regards,
Marek Vasut
Otavio Salvador Aug. 31, 2013, 7:55 p.m.
On Sat, Aug 31, 2013 at 4:51 PM, Marek Vasut <marex@denx.de> wrote:
> Dear Otavio Salvador,
>
>> On Sat, Aug 31, 2013 at 3:51 PM, Marek Vasut <marex@denx.de> wrote:
>> > Dear Otavio Salvador,
>> >
>> >> On Sat, Aug 31, 2013 at 10:53 AM, Marek Vasut <marex@denx.de> wrote:
>> >> > These boards were not sortes in the boards.cfg, fix this.
>> >> >
>> >> > Signed-off-by: Marek Vasut <marex@denx.de>
>> >>
>> >> I think this patch is not need as boards.cfg is being reworked.
>> >
>> > This patch is needed as it fixes inconsistency your previous patch
>> > introduced.
>>
>> I agree with the patch; I just think we must get the boards file
>> rework merged as soon as possible or we'll keep generating conflicts
>> for it.
>
> What rework are you talking about ?

The maintainers file merge with the boards.
Marek Vasut Aug. 31, 2013, 8:03 p.m.
Dear Otavio Salvador,

> On Sat, Aug 31, 2013 at 4:51 PM, Marek Vasut <marex@denx.de> wrote:
> > Dear Otavio Salvador,
> > 
> >> On Sat, Aug 31, 2013 at 3:51 PM, Marek Vasut <marex@denx.de> wrote:
> >> > Dear Otavio Salvador,
> >> > 
> >> >> On Sat, Aug 31, 2013 at 10:53 AM, Marek Vasut <marex@denx.de> wrote:
> >> >> > These boards were not sortes in the boards.cfg, fix this.
> >> >> > 
> >> >> > Signed-off-by: Marek Vasut <marex@denx.de>
> >> >> 
> >> >> I think this patch is not need as boards.cfg is being reworked.
> >> > 
> >> > This patch is needed as it fixes inconsistency your previous patch
> >> > introduced.
> >> 
> >> I agree with the patch; I just think we must get the boards file
> >> rework merged as soon as possible or we'll keep generating conflicts
> >> for it.
> > 
> > What rework are you talking about ?
> 
> The maintainers file merge with the boards.

I suppose there will be not much problem with this reorder ... it would be nice 
if you provided link for a patch or discussion.

Best regards,
Marek Vasut
Stefano Babic Aug. 31, 2013, 8:52 p.m.
Am 31/08/2013 22:03, schrieb Marek Vasut:

> I suppose there will be not much problem with this reorder ... it would be nice 
> if you provided link for a patch or discussion.
> 

http://patchwork.ozlabs.org/patch/266253/

Of course, each change in boards.cfg or MAINTAINER will generate a
conflict, as Otavio stated. I hope this patch will be merged soon.

I propose we postpone this single patch until Albert's flow into
mainline - if we need then some clean up, we will do at that time.

Best regards,
Stefano
Marek Vasut Aug. 31, 2013, 9:14 p.m.
Dear Stefano Babic,

> Am 31/08/2013 22:03, schrieb Marek Vasut:
> > I suppose there will be not much problem with this reorder ... it would
> > be nice if you provided link for a patch or discussion.
> 
> http://patchwork.ozlabs.org/patch/266253/
> 
> Of course, each change in boards.cfg or MAINTAINER will generate a
> conflict, as Otavio stated. I hope this patch will be merged soon.
> 
> I propose we postpone this single patch until Albert's flow into
> mainline - if we need then some clean up, we will do at that time.

Either way WFM. But where did the tartlette-devourer disappear anyway ? I 
haven't seen albert around for a while now ...

Best regards,
Marek Vasut
Otavio Salvador Aug. 31, 2013, 9:15 p.m.
On Sat, Aug 31, 2013 at 5:52 PM, Stefano Babic <sbabic@denx.de> wrote:
> Am 31/08/2013 22:03, schrieb Marek Vasut:
>
>> I suppose there will be not much problem with this reorder ... it would be nice
>> if you provided link for a patch or discussion.
>>
>
> http://patchwork.ozlabs.org/patch/266253/
>
> Of course, each change in boards.cfg or MAINTAINER will generate a
> conflict, as Otavio stated. I hope this patch will be merged soon.
>
> I propose we postpone this single patch until Albert's flow into
> mainline - if we need then some clean up, we will do at that time.

I am adding Albert and Tom in Cc.

Anyone knows what is holding the MAINTAINER file rework from merge?
Tom Rini Sept. 2, 2013, 11 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/31/2013 05:15 PM, Otavio Salvador wrote:
> On Sat, Aug 31, 2013 at 5:52 PM, Stefano Babic <sbabic@denx.de> wrote:
>> Am 31/08/2013 22:03, schrieb Marek Vasut:
>>
>>> I suppose there will be not much problem with this reorder ... it would be nice
>>> if you provided link for a patch or discussion.
>>>
>>
>> http://patchwork.ozlabs.org/patch/266253/
>>
>> Of course, each change in boards.cfg or MAINTAINER will generate a
>> conflict, as Otavio stated. I hope this patch will be merged soon.
>>
>> I propose we postpone this single patch until Albert's flow into
>> mainline - if we need then some clean up, we will do at that time.
> 
> I am adding Albert and Tom in Cc.
> 
> Anyone knows what is holding the MAINTAINER file rework from merge?

I like it, but given the current high conflict rate it has, I'm waiting
for Albert to decide he's ready to re-generate things, probably after he
gets back and re-syncs all the ARM trees.

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJSJRhzAAoJENk4IS6UOR1WVdEP/R4pr9E2sq90mIV6Qx1JIWw6
DIvXqa5tiQfEvkWXveiqOxZwEsAUIBeS7xsMKKQo5yyd3/kIQjoSZUbQt1QNLJVx
mDTXJIKfLEc43cbX5ywDhmmmNS7jB47cvrrAmOBN3L8EAn+GlpHYM0ZHKR9OLSRV
tP5WQ2zgpTKL3c5rNRqL073sxLFOoPaXJgh461OlESjcxm/FlJLvUpIYJtPZdKpB
ZJRbsqqeJbmFEKs4rf+//M4tVQwAtyqHPzLeAU1/fZ3Sx6s2A+aPeMOWuqYlpvik
o8CJ6H/1wkPmSYKZNpItu0jFJSonRq/bKMeC7izbPNODHbiZgLL4qbWqQ+v4Jo2w
l1S15brWNdIiUlLfvMLr4g1K0WObcBAaRwpL3EXd/sS7HSe4hCqTi5Se6bKKysEa
D0FLHRbcGEpsdbyqCi9DoCHEGViO+qon/nxpFWtxeNYSVcumHTVs0+Q/cx2W9qVV
WY6b8zkjnaj4QOgEIIDfRWcVQ3oQIFrSfPf8G/heAwqxyjEtg48baFpA9xk9wBRH
bvB32twE26yTmBKii4pT6Xhl2S1rJDVCPuHIpgHzsJmNT1uPla0gqkrIRHFWCJ2t
Rg+7IxfHvA8cee369M6dwvjsOvQN7oF0xenRaS7KrwgDdWAmzQ4umi+wbmU3CRzU
Jbqj3a7Wccsqqkm7pEdF
=KBB7
-----END PGP SIGNATURE-----
Otavio Salvador Sept. 3, 2013, 1:35 p.m.
On Mon, Sep 2, 2013 at 8:00 PM, Tom Rini <trini@ti.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 08/31/2013 05:15 PM, Otavio Salvador wrote:
>> On Sat, Aug 31, 2013 at 5:52 PM, Stefano Babic <sbabic@denx.de> wrote:
>>> Am 31/08/2013 22:03, schrieb Marek Vasut:
>>>
>>>> I suppose there will be not much problem with this reorder ... it would be nice
>>>> if you provided link for a patch or discussion.
>>>>
>>>
>>> http://patchwork.ozlabs.org/patch/266253/
>>>
>>> Of course, each change in boards.cfg or MAINTAINER will generate a
>>> conflict, as Otavio stated. I hope this patch will be merged soon.
>>>
>>> I propose we postpone this single patch until Albert's flow into
>>> mainline - if we need then some clean up, we will do at that time.
>>
>> I am adding Albert and Tom in Cc.
>>
>> Anyone knows what is holding the MAINTAINER file rework from merge?
>
> I like it, but given the current high conflict rate it has, I'm waiting
> for Albert to decide he's ready to re-generate things, probably after he
> gets back and re-syncs all the ARM trees.

In this case, this patch could be applied to imx tree than.
Stefano Babic Sept. 10, 2013, 5:15 p.m.
On 03/09/2013 15:35, Otavio Salvador wrote:
> On Mon, Sep 2, 2013 at 8:00 PM, Tom Rini <trini@ti.com> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 08/31/2013 05:15 PM, Otavio Salvador wrote:
>>> On Sat, Aug 31, 2013 at 5:52 PM, Stefano Babic <sbabic@denx.de> wrote:
>>>> Am 31/08/2013 22:03, schrieb Marek Vasut:
>>>>
>>>>> I suppose there will be not much problem with this reorder ... it would be nice
>>>>> if you provided link for a patch or discussion.
>>>>>
>>>>
>>>> http://patchwork.ozlabs.org/patch/266253/
>>>>
>>>> Of course, each change in boards.cfg or MAINTAINER will generate a
>>>> conflict, as Otavio stated. I hope this patch will be merged soon.
>>>>
>>>> I propose we postpone this single patch until Albert's flow into
>>>> mainline - if we need then some clean up, we will do at that time.
>>>
>>> I am adding Albert and Tom in Cc.
>>>
>>> Anyone knows what is holding the MAINTAINER file rework from merge?
>>
>> I like it, but given the current high conflict rate it has, I'm waiting
>> for Albert to decide he's ready to re-generate things, probably after he
>> gets back and re-syncs all the ARM trees.
> 
> In this case, this patch could be applied to imx tree than.
> 

Agree.

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Patch hide | download patch | download mbox

diff --git a/boards.cfg b/boards.cfg
index 79d6cd8..5f961da 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -197,10 +197,10 @@  tx25                         arm         arm926ejs   tx25                karo
 zmx25                        arm         arm926ejs   zmx25               syteco         mx25
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27
-mx23_olinuxino               arm         arm926ejs   mx23_olinuxino      olimex         mxs		mx23_olinuxino
 apx4devkit                   arm         arm926ejs   apx4devkit          bluegiga       mxs		apx4devkit
-mx23evk                      arm         arm926ejs   mx23evk             freescale      mxs		mx23evk
 m28evk                       arm         arm926ejs   m28evk              denx           mxs		m28evk
+mx23_olinuxino               arm         arm926ejs   mx23_olinuxino      olimex         mxs		mx23_olinuxino
+mx23evk                      arm         arm926ejs   mx23evk             freescale      mxs		mx23evk
 mx28evk                      arm         arm926ejs   mx28evk             freescale      mxs		mx28evk:ENV_IS_IN_MMC
 mx28evk_nand                 arm         arm926ejs   mx28evk             freescale      mxs		mx28evk:ENV_IS_IN_NAND
 mx28evk_auart_console        arm         arm926ejs   mx28evk             freescale      mxs		mx28evk:MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE,ENV_IS_IN_MMC