Patchwork [U-Boot,5/9] ARM: sbc35_a9g20: re-add MACH_TYPE_SBC35_A9G20

login
register
mail settings
Submitter Anatolij Gustschin
Date Nov. 19, 2011, 11:59 a.m.
Message ID <1321703956-4224-6-git-send-email-agust@denx.de>
Download mbox | patch
Permalink /patch/126542/
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Comments

Anatolij Gustschin - Nov. 19, 2011, 11:59 a.m.
MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
Add it to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
 include/configs/sbc35_a9g20.h         |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)
Simon Glass - Nov. 19, 2011, 5:58 p.m.
On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

I built this and it fixes the failure. I did not test on hardware.

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
>  include/configs/sbc35_a9g20.h         |    3 +++
>  2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index 5f448d9..446afb2 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -152,7 +152,6 @@ int board_init(void)
>        /* Enable Ctrlc */
>        console_init_f();
>
> -       gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
>        /* adress of boot parameters */
>        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
> index 1e355a8..cdf8659 100644
> --- a/include/configs/sbc35_a9g20.h
> +++ b/include/configs/sbc35_a9g20.h
> @@ -36,6 +36,9 @@
>  #define CONFIG_ENV_IS_IN_EEPROM
>  #endif
>
> +#define MACH_TYPE_SBC35_A9G20          1848
> +#define CONFIG_MACH_TYPE               MACH_TYPE_SBC35_A9G20
> +
>  /* ARM asynchronous clock */
>  #define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
>  #define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* 12.000 MHz crystal */
> --
> 1.7.5.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
Anatolij Gustschin - Nov. 21, 2011, 6:55 p.m.
Dear Albin Tonnerre,

On Sat, 19 Nov 2011 12:59:12 +0100
Anatolij Gustschin <agust@denx.de> wrote:

> MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
> Add it to the board config file.

Could you please look at this patch and send your
Acked-by if the patch is okay?

Thanks,
Anatolij

> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
>  include/configs/sbc35_a9g20.h         |    3 +++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index 5f448d9..446afb2 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -152,7 +152,6 @@ int board_init(void)
>  	/* Enable Ctrlc */
>  	console_init_f();
>  
> -	gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
>  	/* adress of boot parameters */
>  	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>  
> diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
> index 1e355a8..cdf8659 100644
> --- a/include/configs/sbc35_a9g20.h
> +++ b/include/configs/sbc35_a9g20.h
> @@ -36,6 +36,9 @@
>  #define CONFIG_ENV_IS_IN_EEPROM
>  #endif
>  
> +#define MACH_TYPE_SBC35_A9G20		1848
> +#define CONFIG_MACH_TYPE		MACH_TYPE_SBC35_A9G20
> +
>  /* ARM asynchronous clock */
>  #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
>  #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12.000 MHz crystal */
Albert ARIBAUD - Dec. 19, 2011, 10:58 a.m.
Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a écrit :
> MACH_TYPE_SBC35_A9G20 was removed from mach-types.h.
> Add it to the board config file.
>
> Signed-off-by: Anatolij Gustschin<agust@denx.de>
> ---
>   board/calao/sbc35_a9g20/sbc35_a9g20.c |    1 -
>   include/configs/sbc35_a9g20.h         |    3 +++
>   2 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index 5f448d9..446afb2 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -152,7 +152,6 @@ int board_init(void)
>   	/* Enable Ctrlc */
>   	console_init_f();
>
> -	gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
>   	/* adress of boot parameters */
>   	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
> index 1e355a8..cdf8659 100644
> --- a/include/configs/sbc35_a9g20.h
> +++ b/include/configs/sbc35_a9g20.h
> @@ -36,6 +36,9 @@
>   #define CONFIG_ENV_IS_IN_EEPROM
>   #endif
>
> +#define MACH_TYPE_SBC35_A9G20		1848
> +#define CONFIG_MACH_TYPE		MACH_TYPE_SBC35_A9G20
> +
>   /* ARM asynchronous clock */
>   #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
>   #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12.000 MHz crystal */

Applied to u-boot-arm/master, thanks!

Amicalement,

Patch

diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
index 5f448d9..446afb2 100644
--- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
+++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
@@ -152,7 +152,6 @@  int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-	gd->bd->bi_arch_number = MACH_TYPE_SBC35_A9G20;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index 1e355a8..cdf8659 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -36,6 +36,9 @@ 
 #define CONFIG_ENV_IS_IN_EEPROM
 #endif
 
+#define MACH_TYPE_SBC35_A9G20		1848
+#define CONFIG_MACH_TYPE		MACH_TYPE_SBC35_A9G20
+
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	12000000	/* 12.000 MHz crystal */