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

login
register
mail settings
Submitter Andreas Bießmann
Date March 10, 2013, 4:16 p.m.
Message ID <1362932168-31180-1-git-send-email-andreas.devel@googlemail.com>
Download mbox | patch
Permalink /patch/226456/
State Superseded
Delegated to: Andreas Bießmann
Headers show

Comments

Andreas Bießmann - March 10, 2013, 4:16 p.m.
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Bo Shen <voice.shen@atmel.com>
---
 board/atmel/at91sam9260ek/at91sam9260ek.c |   12 ------------
 include/configs/at91sam9260ek.h           |   20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)
Bo Shen - March 14, 2013, 1:46 a.m.
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(-)
>
> 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
>
Andreas Bießmann - March 14, 2013, 8:44 a.m.
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

Best regards

Andreas Bießmann
Bo Shen - March 14, 2013, 10:25 a.m.
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

Patch

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