diff mbox

[U-Boot] MX51: efikamx: fix wrong name in boards.cfg

Message ID 1310557095-18522-1-git-send-email-sbabic@denx.de
State Changes Requested
Headers show

Commit Message

Stefano Babic July 13, 2011, 11:38 a.m. UTC
Wrong name in boards.cfg for the efikamx board
makes that some files of the mx51evk instead of
efikamx are used.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Marek Vasut <marek.vasut@gmail.com>
---
 boards.cfg                |    2 +-
 include/configs/efikamx.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

Comments

Wolfgang Denk July 13, 2011, 11:58 a.m. UTC | #1
Dear Stefano Babic,

In message <1310557095-18522-1-git-send-email-sbabic@denx.de> you wrote:
> Wrong name in boards.cfg for the efikamx board
> makes that some files of the mx51evk instead of
> efikamx are used.
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>
> CC: Marek Vasut <marek.vasut@gmail.com>
> ---
>  boards.cfg                |    2 +-
>  include/configs/efikamx.h |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)

Um... the CONFIG_SYS_TEXT_BASE is unrelated and should be submitted in
a separate patch.

Best regards,

Wolfgang Denk
Marek Vasut July 13, 2011, 12:24 p.m. UTC | #2
On Wednesday, July 13, 2011 01:38:15 PM Stefano Babic wrote:
> Wrong name in boards.cfg for the efikamx board
> makes that some files of the mx51evk instead of
> efikamx are used.

Jana fixed this some time ago ... I have it in my tree and I send it recently to 
he ML ... 

http://git.denx.de/?p=u-boot/u-boot-
pxa.git;a=commit;h=ce52afa30284fb08a3129ed86f053e2b0e9b9a5e
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>
> CC: Marek Vasut <marek.vasut@gmail.com>
> ---
>  boards.cfg                |    2 +-
>  include/configs/efikamx.h |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/boards.cfg b/boards.cfg
> index 0fe0f0e..7c79034 100644
> --- a/boards.cfg
> +++ b/boards.cfg
> @@ -140,7 +140,7 @@ omap5912osk                  arm         arm926ejs   - 
>                  ti edminiv2                     arm         arm926ejs   -
>                   LaCie          orion5x dkb			     arm         
arm926ejs 
>  -                   Marvell        pantheon ca9x4_ct_vxp                
> arm         armv7       vexpress            armltd -efikamx               
>       arm         armv7       efikamx             -             
> mx5		mx51evk:IMX_CONFIG=board/efikamx/imximage.cfg +efikamx               
>       arm         armv7       efikamx             -             
> mx5		efikamx:IMX_CONFIG=board/efikamx/imximage.cfg mx51evk                
>      arm         armv7       mx51evk             freescale     
> mx5		mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg mx53ard      
>                arm         armv7       mx53ard             freescale     
> mx5		mx53ard:IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg 
mx53evk  
>                    arm         armv7       mx53evk             freescale  
>    mx5		mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg diff --git
> a/include/configs/efikamx.h b/include/configs/efikamx.h index
> a04ac49..9c98cdc 100644
> --- a/include/configs/efikamx.h
> +++ b/include/configs/efikamx.h
> @@ -38,6 +38,8 @@
>  #define CONFIG_DISPLAY_CPUINFO
>  #define CONFIG_DISPLAY_BOARDINFO
> 
> +#define CONFIG_SYS_TEXT_BASE	0x97800000
> +
>  #define CONFIG_SYS_L2CACHE_OFF
> 
>  /*
Wolfgang Denk July 13, 2011, 12:29 p.m. UTC | #3
Dear Marek Vasut,

In message <201107131424.07581.marek.vasut@gmail.com> you wrote:
> On Wednesday, July 13, 2011 01:38:15 PM Stefano Babic wrote:
> > Wrong name in boards.cfg for the efikamx board
> > makes that some files of the mx51evk instead of
> > efikamx are used.
> 
> Jana fixed this some time ago ... I have it in my tree and I send it recently to 
> he ML ... 
> 
> http://git.denx.de/?p=u-boot/u-boot-
> pxa.git;a=commit;h=ce52afa30284fb08a3129ed86f053e2b0e9b9a5e

But this is wrong.  This is a iMX system, so all patches must go
through the iMX custodian and his repositor.

This has no place in the u-boot-pxa reporistory.  Please make sure to
remove it there before you send any pull requests to Albert.

Best regards,

Wolfgang Denk
Stefano Babic July 13, 2011, 12:32 p.m. UTC | #4
On 07/13/2011 01:58 PM, Wolfgang Denk wrote:
> Dear Stefano Babic,
> 
> In message <1310557095-18522-1-git-send-email-sbabic@denx.de> you wrote:
>> Wrong name in boards.cfg for the efikamx board
>> makes that some files of the mx51evk instead of
>> efikamx are used.
>>
>> Signed-off-by: Stefano Babic <sbabic@denx.de>
>> CC: Marek Vasut <marek.vasut@gmail.com>
>> ---
>>  boards.cfg                |    2 +-
>>  include/configs/efikamx.h |    2 ++
>>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> Um... the CONFIG_SYS_TEXT_BASE is unrelated and should be submitted in
> a separate patch.
> 

Agree. Fix in V2

Best regards,
Stefano Babic
Marek Vasut July 13, 2011, 1:03 p.m. UTC | #5
On Wednesday, July 13, 2011 02:29:03 PM Wolfgang Denk wrote:
> Dear Marek Vasut,
> 
> In message <201107131424.07581.marek.vasut@gmail.com> you wrote:
> > On Wednesday, July 13, 2011 01:38:15 PM Stefano Babic wrote:
> > > Wrong name in boards.cfg for the efikamx board
> > > makes that some files of the mx51evk instead of
> > > efikamx are used.
> > 
> > Jana fixed this some time ago ... I have it in my tree and I send it
> > recently to he ML ...
> > 
> > http://git.denx.de/?p=u-boot/u-boot-
> > pxa.git;a=commit;h=ce52afa30284fb08a3129ed86f053e2b0e9b9a5e
> 
> But this is wrong.  This is a iMX system, so all patches must go
> through the iMX custodian and his repositor.
> 
> This has no place in the u-boot-pxa reporistory.  Please make sure to
> remove it there before you send any pull requests to Albert.

Shall I prepare a branch with the stuff I want up and send pull rq to albert ?
> 
> Best regards,
> 
> Wolfgang Denk
Marek Vasut July 13, 2011, 1:04 p.m. UTC | #6
On Wednesday, July 13, 2011 02:32:41 PM Stefano Babic wrote:
> On 07/13/2011 01:58 PM, Wolfgang Denk wrote:
> > Dear Stefano Babic,
> > 
> > In message <1310557095-18522-1-git-send-email-sbabic@denx.de> you wrote:
> >> Wrong name in boards.cfg for the efikamx board
> >> makes that some files of the mx51evk instead of
> >> efikamx are used.
> >> 
> >> Signed-off-by: Stefano Babic <sbabic@denx.de>
> >> CC: Marek Vasut <marek.vasut@gmail.com>
> >> ---
> >> 
> >>  boards.cfg                |    2 +-
> >>  include/configs/efikamx.h |    2 ++
> >>  2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > Um... the CONFIG_SYS_TEXT_BASE is unrelated and should be submitted in
> > a separate patch.
> 
> Agree. Fix in V2

Right, Jana's on vacation till 18th, but I guess I can split it and send pullrq 
... whatever.
> 
> Best regards,
> Stefano Babic
Wolfgang Denk July 13, 2011, 1:27 p.m. UTC | #7
Dear Marek Vasut,

In message <201107131503.59381.marek.vasut@gmail.com> you wrote:
>
> > This has no place in the u-boot-pxa reporistory.  Please make sure to
> > remove it there before you send any pull requests to Albert.
> 
> Shall I prepare a branch with the stuff I want up and send pull rq to albert ?

I'm a bit surprised by thi squestion.  Yes, if you have any patches in
the pxa repository that shall go intoi mainline, then you are supposed
to send a pull request to Albert.  Otherwise nothing will happen.

Best regards,

Wolfgang Denk
Marek Vasut July 13, 2011, 1:29 p.m. UTC | #8
On Wednesday, July 13, 2011 03:27:11 PM Wolfgang Denk wrote:
> Dear Marek Vasut,
> 
> In message <201107131503.59381.marek.vasut@gmail.com> you wrote:
> > > This has no place in the u-boot-pxa reporistory.  Please make sure to
> > > remove it there before you send any pull requests to Albert.
> > 
> > Shall I prepare a branch with the stuff I want up and send pull rq to
> > albert ?
> 
> I'm a bit surprised by thi squestion.  Yes, if you have any patches in
> the pxa repository that shall go intoi mainline, then you are supposed
> to send a pull request to Albert.  Otherwise nothing will happen.

No, I mean branch in u-boot-pxa ... since they are unrelated.
> 
> Best regards,
> 
> Wolfgang Denk
Stefano Babic July 13, 2011, 1:40 p.m. UTC | #9
On 07/13/2011 03:29 PM, Marek Vasut wrote:
> On Wednesday, July 13, 2011 03:27:11 PM Wolfgang Denk wrote:
>> Dear Marek Vasut,
>>
>> In message <201107131503.59381.marek.vasut@gmail.com> you wrote:
>>>> This has no place in the u-boot-pxa reporistory.  Please make sure to
>>>> remove it there before you send any pull requests to Albert.
>>>
>>> Shall I prepare a branch with the stuff I want up and send pull rq to
>>> albert ?
>>
>> I'm a bit surprised by thi squestion.  Yes, if you have any patches in
>> the pxa repository that shall go intoi mainline, then you are supposed
>> to send a pull request to Albert.  Otherwise nothing will happen.
> 
> No, I mean branch in u-boot-pxa ... since they are unrelated.

Marek,

I missed Jana's patches (they were sent yesterday, I see now), and I get
the same bug today after rebuilding all i.MX boards - this is the reason
for my patches on the same issue.

I will take Jana's patches and I will apply them to u-boot-imx. You do
not need to apply to u-boot-imx, as they are unrelated to PXA

Stefano
Wolfgang Denk July 13, 2011, 1:47 p.m. UTC | #10
Dear Marek Vasut,

In message <201107131529.21828.marek.vasut@gmail.com> you wrote:
>
> > I'm a bit surprised by thi squestion.  Yes, if you have any patches in
> > the pxa repository that shall go intoi mainline, then you are supposed
> > to send a pull request to Albert.  Otherwise nothing will happen.
> 
> No, I mean branch in u-boot-pxa ... since they are unrelated.

Patches are normally picked up by the respective custodian.  If you
are anot the responsible custodian, you normally don't have to care
about patches - actually this is usually even counter productive.

I find the most efficient way to pick up patches to be from
patchwork, because this already takes care about things like
automatically adding the respective Acked-by: lines, etc.

Best regards,

Wolfgang Denk
Stefano Babic July 13, 2011, 1:52 p.m. UTC | #11
On 07/13/2011 03:47 PM, Wolfgang Denk wrote:
>> No, I mean branch in u-boot-pxa ... since they are unrelated.
> 
> Patches are normally picked up by the respective custodian.  If you
> are anot the responsible custodian, you normally don't have to care
> about patches - actually this is usually even counter productive.

Correct - I care about Jana's patches - drop them from u-boot-pxa

> I find the most efficient way to pick up patches to be from
> patchwork, because this already takes care about things like
> automatically adding the respective Acked-by: lines, etc.

Agree. It is a very comfortable way to to things, and saves a lot of time.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index 0fe0f0e..7c79034 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -140,7 +140,7 @@  omap5912osk                  arm         arm926ejs   -                   ti
 edminiv2                     arm         arm926ejs   -                   LaCie          orion5x
 dkb			     arm         arm926ejs   -                   Marvell        pantheon
 ca9x4_ct_vxp                 arm         armv7       vexpress            armltd
-efikamx                      arm         armv7       efikamx             -              mx5		mx51evk:IMX_CONFIG=board/efikamx/imximage.cfg
+efikamx                      arm         armv7       efikamx             -              mx5		efikamx:IMX_CONFIG=board/efikamx/imximage.cfg
 mx51evk                      arm         armv7       mx51evk             freescale      mx5		mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
 mx53ard                      arm         armv7       mx53ard             freescale      mx5		mx53ard:IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg
 mx53evk                      arm         armv7       mx53evk             freescale      mx5		mx53evk:IMX_CONFIG=board/freescale/mx53evk/imximage.cfg
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index a04ac49..9c98cdc 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -38,6 +38,8 @@ 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
+#define CONFIG_SYS_TEXT_BASE	0x97800000
+
 #define CONFIG_SYS_L2CACHE_OFF
 
 /*