[U-Boot] [PATCH] at91sam9260ek: move board id setup to config header

[Bo Shen]

On 3/11/2013 0:16, Andreas Bießmann wrote:
> Signed-off-by: Andreas Bießmann <andreas.devel at googlemail.com>
> Cc: Bo Shen <voice.shen at atmel.com>

Acked-by: Bo Shen <voice.shen at atmel.com>

> ---
>   board/atmel/at91sam9260ek/at91sam9260ek.c |   12 ------------
>   include/configs/at91sam9260ek.h           |   20 ++++++++++++++++++++
>   2 files changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c
> index 3aa394a..049b3d7 100644
> --- a/board/atmel/at91sam9260ek/at91sam9260ek.c
> +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c
> @@ -157,18 +157,6 @@ int board_early_init_f(void)
>
>   int board_init(void)
>   {
> -#ifdef CONFIG_AT91SAM9G20EK_2MMC
> -	/* arch number of AT91SAM9G20EK_2MMC-Board */
> -	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK_2MMC;
> -#else
> -#ifdef CONFIG_AT91SAM9G20EK
> -	/* arch number of AT91SAM9G20EK-Board */
> -	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;
> -#else
> -	/* arch number of AT91SAM9260EK-Board */
> -	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK;
> -#endif
> -#endif
>   	/* adress of boot parameters */
>   	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
> index 02696b3..2d2efb2 100644
> --- a/include/configs/at91sam9260ek.h
> +++ b/include/configs/at91sam9260ek.h
> @@ -125,6 +125,26 @@
>   	(ATMEL_BASE_SRAM1 + 0x1000 - GENERATED_GBL_DATA_SIZE)
>   #endif
>
> +/*
> + * The (arm)linux board id set by generic code depending on configured board
> + * (see boards.cfg for different boards)
> + */
> +#ifdef CONFIG_AT91SAM9G20
> +	/* the sam9g20 variants have two different board ids */
> +# ifdef CONFIG_AT91SAM9G20EK_2MMC
> +	/* we may be setup for the 2MMC variant of at91sam9g20ek */
> +#  define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK_2MMC
> +# else
> +#  ifdef CONFIG_AT91SAM9G20EK
> +	/* or the normal at91sam9g20ek */
> +#   define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK
> +#  endif
> +# endif
> +#else
> +	/* otherwise default to good old at91sam9260ek */
> +# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK
> +#endif
> +
>   /* DataFlash */
>   #ifndef CONFIG_AT91SAM9G20EK_2MMC
>   #define CONFIG_ATMEL_DATAFLASH_SPI
>