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

[Bo Shen <voice.shen@atmel.com>]

Hi Andreas,

On 3/14/2013 16:44, Andreas Bie?mann wrote:
> Hi Bo,
>
> On 03/14/2013 02:46 AM, Bo Shen wrote:
>> On 3/11/2013 0:16, Andreas Bie?mann wrote:
>>> Signed-off-by: Andreas Bie?mann <andreas.devel@googlemail.com>
>>> Cc: Bo Shen <voice.shen@atmel.com>
>>
>> Acked-by: Bo Shen <voice.shen@atmel.com>
>>
>>> ---
>>>    board/atmel/at91sam9260ek/at91sam9260ek.c |   12 ------------
>>>    include/configs/at91sam9260ek.h           |   20 ++++++++++++++++++++
>>>    2 files changed, 20 insertions(+), 12 deletions(-)
>>>
>
> <snip>
>
>>> --- 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
>
> I think I'll generate a v2 here. It is safer to have:
>
> #ifdef AT91SAM9G20
> #ifdef 2MMC
> // 2MMC
> #else
> // default for SAM9G20
> #endif
> #else
> // default for SAM9260
> #endif

I agree.

> Best regards
>
> Andreas Bie?mann
>

Best Regards,
Bo Shen