[U-Boot] mach-type #define mismatch for lange51/efikamx

[U-Boot] mach-type #define mismatch for lange51/efikamx

[Loïc Minier]

        Hey!

> iMX5: EfikaMX: Preliminary board support

 u-boot-imx has:
    #define MACH_TYPE_MX51_LANGE51         2336
    #define MACH_TYPE_MX51_LANGE52         2337

 u-boot-arm has:
    #define MACH_TYPE_MX51_EFIKAMX         2336
    #define MACH_TYPE_MX51_LANGE52         2337

 and linux has:
    mx51_efikamx            MACH_MX51_EFIKAMX       MX51_EFIKAMX 2336
    mx51_lange52            MACH_MX51_LANGE52       MX51_LANGE52 2337

 but board/efikamx/efikamx.c uses MACH_TYPE_MX51_LANGE51 (and hence
 fails to build in u-boot-arm.git and u-boot.git).

 So while (Pegatron?) Lange 5.1 and 5.2 might have been more consistent,
 I think we need to switch board/efikamx/efikamx.c to the linux name
 MACH_MX51_EFIKAMX.

   Thanks!
-- 
Lo?c Minier

[U-Boot] mach-type #define mismatch for lange51/efikamx

[Stefano Babic]

On 02/03/2011 01:04 AM, Lo?c Minier wrote:
>         Hey!
> 
>> iMX5: EfikaMX: Preliminary board support
> 
>  u-boot-imx has:
>     #define MACH_TYPE_MX51_LANGE51         2336
>     #define MACH_TYPE_MX51_LANGE52         2337
> 
>  u-boot-arm has:
>     #define MACH_TYPE_MX51_EFIKAMX         2336
>     #define MACH_TYPE_MX51_LANGE52         2337
> 
>  and linux has:
>     mx51_efikamx            MACH_MX51_EFIKAMX       MX51_EFIKAMX 2336
>     mx51_lange52            MACH_MX51_LANGE52       MX51_LANGE52 2337
> 
>  but board/efikamx/efikamx.c uses MACH_TYPE_MX51_LANGE51 (and hence
>  fails to build in u-boot-arm.git and u-boot.git).
> 
>  So while (Pegatron?) Lange 5.1 and 5.2 might have been more consistent,
>  I think we need to switch board/efikamx/efikamx.c to the linux name
>  MACH_MX51_EFIKAMX.

Marek, what do you think about ? It seems that the machine type for
efikamx is wrong.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] mach-type #define mismatch for lange51/efikamx

[Marek Vasut]

On Thursday 03 February 2011 07:32:02 Stefano Babic wrote:
> On 02/03/2011 01:04 AM, Lo?c Minier wrote:
> >         Hey!
> >> 
> >> iMX5: EfikaMX: Preliminary board support
> >> 
> >  u-boot-imx has:
> >     #define MACH_TYPE_MX51_LANGE51         2336
> >     #define MACH_TYPE_MX51_LANGE52         2337
> >  
> >  u-boot-arm has:
> >     #define MACH_TYPE_MX51_EFIKAMX         2336
> >     #define MACH_TYPE_MX51_LANGE52         2337
> >  
> >  and linux has:
> >     mx51_efikamx            MACH_MX51_EFIKAMX       MX51_EFIKAMX 2336
> >     mx51_lange52            MACH_MX51_LANGE52       MX51_LANGE52 2337
> >  
> >  but board/efikamx/efikamx.c uses MACH_TYPE_MX51_LANGE51 (and hence
> >  fails to build in u-boot-arm.git and u-boot.git).
> >  
> >  So while (Pegatron?) Lange 5.1 and 5.2 might have been more consistent,
> >  I think we need to switch board/efikamx/efikamx.c to the linux name
> >  MACH_MX51_EFIKAMX.
> 
> Marek, what do you think about ? It seems that the machine type for
> efikamx is wrong.

It used to be lange51, that's the official code-name too. They (genesi I guess) 
seem to have requested an update in linux-arm machine ID database. Obviously, 
needs a change. Thanks
> 
> Best regards,
> Stefano Babic

[U-Boot] [PATCH] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

[Loïc Minier]

Upstream linux moved from MACH_TYPE_MX51_LANGE51 to
MACH_TYPE_MX51_EFIKAMX.
---
 board/efikamx/efikamx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
index 4efbeaf..f735260 100644
--- a/board/efikamx/efikamx.c
+++ b/board/efikamx/efikamx.c
@@ -621,7 +621,7 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_MX51_LANGE51;
+	gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	return 0;
-- 
1.7.2.3

[U-Boot] [PATCH V2] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

[Loïc Minier]

Upstream linux moved from MACH_TYPE_MX51_LANGE51 to
MACH_TYPE_MX51_EFIKAMX.

Signed-off-by: Lo?c Minier <loic.minier@linaro.org>
---
Changes for V2:
 * Add Signed-off-by

 board/efikamx/efikamx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
index 4efbeaf..f735260 100644
--- a/board/efikamx/efikamx.c
+++ b/board/efikamx/efikamx.c
@@ -621,7 +621,7 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_MX51_LANGE51;
+	gd->bd->bi_arch_number = MACH_TYPE_MX51_EFIKAMX;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	return 0;
-- 
1.7.2.3

[U-Boot] [PATCH V2] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

[Stefano Babic]

On 02/03/2011 03:19 PM, Lo?c Minier wrote:
> Upstream linux moved from MACH_TYPE_MX51_LANGE51 to
> MACH_TYPE_MX51_EFIKAMX.
> 
> Signed-off-by: Lo?c Minier <loic.minier@linaro.org>
> ---
> Changes for V2:
>  * Add Signed-off-by

Applied to u-boot-imx, as this is a fix, thanks.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH V2] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

[Albert ARIBAUD]

Hi Stefano,

Le 04/02/2011 16:30, Stefano Babic a ?crit :
> On 02/03/2011 03:19 PM, Lo?c Minier wrote:
>> Upstream linux moved from MACH_TYPE_MX51_LANGE51 to
>> MACH_TYPE_MX51_EFIKAMX.
>>
>> Signed-off-by: Lo?c Minier<loic.minier@linaro.org>
>> ---
>> Changes for V2:
>>   * Add Signed-off-by
>
> Applied to u-boot-imx, as this is a fix, thanks.
>
> Best regards,
> Stefano Babic

Do you intend to send out a new pull request for -rc2? -- not hurrying 
you, just asking.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH V2] EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

[Stefano Babic]

On 02/05/2011 10:48 AM, Albert ARIBAUD wrote:

Hi Albert,

> Do you intend to send out a new pull request for -rc2? -- not hurrying
> you, just asking.

Yes. At the moment, I have only this patch on my list, so I am waiting a
couple of days more to check if I had to merge some other patches. Then
I will send you the pull-request.

Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================