mach-type #define mismatch for lange51/efikamx

U-Boot Superseded Loïc Minier 5 participants 8 messages Feb 3, 2011 – Feb 5, 2011

lore

Share & tools

lore

Loïc Minier

author

2011-02-03 00:04 UTC #0 lore raw

Hey!

Quoted 1 line

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!

Signature · 1 line

Lo?c Minier

Stefano Babic

2011-02-03 06:32 UTC #1 lore raw

Quoted 16 lines · Lo?c Minier

Hey!

Quoted 1 line

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

Quoted 6 lines

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

Signature · 5 lines

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

Marek Vasut

2011-02-03 07:50 UTC #2 lore raw

Quoted 20 lines · On Thursday 03 February 2011 07:32:02 Stefano Babic wrote:

Quoted 19 lines · Lo?c Minier
Hey!
Quoted 3 lines
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).

Quoted 6 lines

Quoted 3 lines
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

Quoted 3 lines

Best regards,
Stefano Babic

Loïc Minier

2011-02-03 11:43 UTC #3 lore raw

PATCH 1/1 EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

In reply to 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(-)

board/efikamx/efikamx.c +1 -1

index 4efbeaf..f735260 100644
@@ -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;

Signature · 1 line

1.7.2.3

Loïc Minier

2011-02-03 14:19 UTC #4 lore raw

PATCH v2 1/1 EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX.

Signed-off-by Lo?c Minier <[email protected]>

---
Changes for V2:
* Add Signed-off-by

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

board/efikamx/efikamx.c +1 -1

index 4efbeaf..f735260 100644
@@ -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;

Signature · 1 line

1.7.2.3

Stefano Babic

2011-02-04 15:30 UTC #5 lore raw

PATCH v2 1/1 EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

Quoted 7 lines · Lo?c Minier

Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX.
Signed-off-by Lo?c Minier <[email protected]>
---
Changes for V2:
* Add Signed-off-by

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

Best regards,
Stefano Babic

Signature · 5 lines

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

Albert ARIBAUD

2011-02-05 09:48 UTC #6 lore raw

PATCH v2 1/1 EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

Hi Stefano,

Le 04/02/2011 16:30, Stefano Babic a ?crit :

Quoted 9 lines · Lo?c Minier

Quoted 7 lines
Upstream linux moved from MACH_TYPE_MX51_LANGE51 to MACH_TYPE_MX51_EFIKAMX.
Signed-off-by Lo?c Minier<[email protected]>
---
Changes for V2:
* Add Signed-off-by

Quoted 4 lines

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,

Signature · 1 line

Albert.

Stefano Babic

2011-02-05 11:25 UTC #7 lore raw

PATCH v2 1/1 EfikaMX: switch to MACH_TYPE_MX51_EFIKAMX

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

Hi Albert,

Quoted 2 lines

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

Signature · 5 lines

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