Patchwork [U-Boot,5/13] mx31pdk: Place machine ID into board config

login
register
mail settings
Submitter Fabio Estevam
Date Sept. 22, 2011, 6:07 p.m.
Message ID <1316714842-18271-5-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/115979/
State Accepted
Commit 9aa3c6a1ee907a042a2f38e6397e1678c8597927
Delegated to: Stefano Babic
Headers show

Comments

Fabio Estevam - Sept. 22, 2011, 6:07 p.m.
Let common code set the machine ID.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 board/freescale/mx31pdk/mx31pdk.c |    1 -
 include/configs/mx31pdk.h         |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)
Stefano Babic - Sept. 23, 2011, 8:53 a.m.
On 09/22/2011 08:07 PM, Fabio Estevam wrote:
> Let common code set the machine ID.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  board/freescale/mx31pdk/mx31pdk.c |    1 -
>  include/configs/mx31pdk.h         |    2 ++
>  2 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c
> index b522cfa..276d451 100644
> --- a/board/freescale/mx31pdk/mx31pdk.c
> +++ b/board/freescale/mx31pdk/mx31pdk.c
> @@ -63,7 +63,6 @@ int board_early_init_f(void)
>  
>  int board_init(void)
>  {
> -	gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
>  	/* adress of boot parameters */
>  	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
>  
> diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
> index 466dc5d..cd156d8 100644
> --- a/include/configs/mx31pdk.h
> +++ b/include/configs/mx31pdk.h
> @@ -45,6 +45,8 @@
>  #define CONFIG_SETUP_MEMORY_TAGS
>  #define CONFIG_INITRD_TAG
>  
> +#define CONFIG_MACH_TYPE	MACH_TYPE_MX31_3DS
> +
>  #if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
>  #define CONFIG_SKIP_LOWLEVEL_INIT
>  #endif

Applied to u-boot-imx, next branch, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c
index b522cfa..276d451 100644
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@@ -63,7 +63,6 @@  int board_early_init_f(void)
 
 int board_init(void)
 {
-	gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 466dc5d..cd156d8 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -45,6 +45,8 @@ 
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_MX31_3DS
+
 #if defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif