Patchwork [U-Boot,6/9] ARM: tny_a9260: re-add MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260

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

Comments

Anatolij Gustschin - Nov. 19, 2011, 11:59 a.m.
MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
from mach-types.h. Add them to the board config file.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/calao/tny_a9260/tny_a9260.c |    5 -----
 include/configs/tny_a9260.h       |    4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)
Simon Glass - Nov. 19, 2011, 6 p.m.
On Sat, Nov 19, 2011 at 3:59 AM, Anatolij Gustschin <agust@denx.de> wrote:
> MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
> from mach-types.h. Add them 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/tny_a9260/tny_a9260.c |    5 -----
>  include/configs/tny_a9260.h       |    4 ++++
>  2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index ab51a33..a472b91 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -86,11 +86,6 @@ int board_init(void)
>        /* Enable Ctrlc */
>        console_init_f();
>
> -#if defined(CONFIG_TNY_A9260)
> -       gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
> -#elif defined(CONFIG_TNY_A9G20)
> -       gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
> -#endif
>        /* adress of boot parameters */
>        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
> index 986aeba..c632de6 100644
> --- a/include/configs/tny_a9260.h
> +++ b/include/configs/tny_a9260.h
> @@ -45,8 +45,12 @@
>  /* Define actual evaluation board type from used processor type */
>  #ifdef CONFIG_AT91SAM9G20
>  # define CONFIG_TNY_A9G20
> +# define MACH_TYPE_TNY_A9G20           2059
> +# define CONFIG_MACH_TYPE              MACH_TYPE_TNY_A9G20
>  #else
>  # define CONFIG_TNY_A9260
> +# define MACH_TYPE_TNY_A9260           2058
> +# define CONFIG_MACH_TYPE              MACH_TYPE_TNY_A9260
>  #endif

Seems odd to me to have the #define MACH_TYPE_TNY_ inside the #ifdef
also, but ok.

>
>  /* ARM asynchronous clock */
> --
> 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:57 p.m.
Dear Albin Tonnerre,

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

> MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
> from mach-types.h. Add them 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/tny_a9260/tny_a9260.c |    5 -----
>  include/configs/tny_a9260.h       |    4 ++++
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index ab51a33..a472b91 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -86,11 +86,6 @@ int board_init(void)
>  	/* Enable Ctrlc */
>  	console_init_f();
>  
> -#if defined(CONFIG_TNY_A9260)
> -	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
> -#elif defined(CONFIG_TNY_A9G20)
> -	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
> -#endif
>  	/* adress of boot parameters */
>  	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>  
> diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
> index 986aeba..c632de6 100644
> --- a/include/configs/tny_a9260.h
> +++ b/include/configs/tny_a9260.h
> @@ -45,8 +45,12 @@
>  /* Define actual evaluation board type from used processor type */
>  #ifdef CONFIG_AT91SAM9G20
>  # define CONFIG_TNY_A9G20
> +# define MACH_TYPE_TNY_A9G20		2059
> +# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9G20
>  #else
>  # define CONFIG_TNY_A9260
> +# define MACH_TYPE_TNY_A9260		2058
> +# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9260
>  #endif
>  
>  /* ARM asynchronous clock */
Albert ARIBAUD - Dec. 19, 2011, 10:58 a.m.
Hi Anatolij,

Le 19/11/2011 12:59, Anatolij Gustschin a écrit :
> MACH_TYPE_TNY_A9G20 and MACH_TYPE_TNY_A9260 were removed
> from mach-types.h. Add them to the board config file.
>
> Signed-off-by: Anatolij Gustschin<agust@denx.de>
> ---
>   board/calao/tny_a9260/tny_a9260.c |    5 -----
>   include/configs/tny_a9260.h       |    4 ++++
>   2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index ab51a33..a472b91 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -86,11 +86,6 @@ int board_init(void)
>   	/* Enable Ctrlc */
>   	console_init_f();
>
> -#if defined(CONFIG_TNY_A9260)
> -	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
> -#elif defined(CONFIG_TNY_A9G20)
> -	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
> -#endif
>   	/* adress of boot parameters */
>   	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
> index 986aeba..c632de6 100644
> --- a/include/configs/tny_a9260.h
> +++ b/include/configs/tny_a9260.h
> @@ -45,8 +45,12 @@
>   /* Define actual evaluation board type from used processor type */
>   #ifdef CONFIG_AT91SAM9G20
>   # define CONFIG_TNY_A9G20
> +# define MACH_TYPE_TNY_A9G20		2059
> +# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9G20
>   #else
>   # define CONFIG_TNY_A9260
> +# define MACH_TYPE_TNY_A9260		2058
> +# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9260
>   #endif
>
>   /* ARM asynchronous clock */

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

Amicalement,

Patch

diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
index ab51a33..a472b91 100644
--- a/board/calao/tny_a9260/tny_a9260.c
+++ b/board/calao/tny_a9260/tny_a9260.c
@@ -86,11 +86,6 @@  int board_init(void)
 	/* Enable Ctrlc */
 	console_init_f();
 
-#if defined(CONFIG_TNY_A9260)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9260;
-#elif defined(CONFIG_TNY_A9G20)
-	gd->bd->bi_arch_number = MACH_TYPE_TNY_A9G20;
-#endif
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index 986aeba..c632de6 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -45,8 +45,12 @@ 
 /* Define actual evaluation board type from used processor type */
 #ifdef CONFIG_AT91SAM9G20
 # define CONFIG_TNY_A9G20
+# define MACH_TYPE_TNY_A9G20		2059
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9G20
 #else
 # define CONFIG_TNY_A9260
+# define MACH_TYPE_TNY_A9260		2058
+# define CONFIG_MACH_TYPE		MACH_TYPE_TNY_A9260
 #endif
 
 /* ARM asynchronous clock */