* [U-Boot] [PATCH] at91: move CONFIG_AT91FAMILY from board config file to hardware.h
@ 2014-05-16 8:52 Josh Wu
2014-05-16 10:02 ` Bo Shen
0 siblings, 1 reply; 3+ messages in thread
From: Josh Wu @ 2014-05-16 8:52 UTC (permalink / raw)
To: u-boot
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++
include/configs/at91sam9m10g45ek.h | 1 -
include/configs/at91sam9n12ek.h | 1 -
include/configs/at91sam9x5ek.h | 1 -
include/configs/sama5d3_xplained.h | 1 -
include/configs/sama5d3xek.h | 1 -
6 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h b/arch/arm/include/asm/arch-at91/at91sam9x5.h
index a471038..36a5cdf 100644
--- a/arch/arm/include/asm/arch-at91/at91sam9x5.h
+++ b/arch/arm/include/asm/arch-at91/at91sam9x5.h
@@ -12,6 +12,8 @@
#ifndef __AT91SAM9X5_H__
#define __AT91SAM9X5_H__
+#define CONFIG_AT91FAMILY /* it's a member of AT91 family */
+
/*
* Peripheral identifiers/interrupts.
*/
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 7a3c9b5..5d5fbe5 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -22,7 +22,6 @@
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
#define CONFIG_AT91SAM9M10G45EK
-#define CONFIG_AT91FAMILY
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index e23549d..ebfc26e 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -19,7 +19,6 @@
#define CONFIG_SYS_TEXT_BASE 0x26f00000
#define CONFIG_ARM926EJS
-#define CONFIG_AT91FAMILY
/* ARM asynchronous clock */
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index f0a6757..b2dd252 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -18,7 +18,6 @@
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#define CONFIG_AT91SAM9X5EK
-#define CONFIG_AT91FAMILY
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 41c946d..d7fb850 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -18,7 +18,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-#define CONFIG_AT91FAMILY
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_BOARD_EARLY_INIT_F
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index b509c2d..72f0f27 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -21,7 +21,6 @@
#define CONFIG_SYS_AT91_SLOW_CLOCK 32768
#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
-#define CONFIG_AT91FAMILY
#define CONFIG_ARCH_CPU_INIT
#ifndef CONFIG_SPL_BUILD
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] at91: move CONFIG_AT91FAMILY from board config file to hardware.h
2014-05-16 8:52 [U-Boot] [PATCH] at91: move CONFIG_AT91FAMILY from board config file to hardware.h Josh Wu
@ 2014-05-16 10:02 ` Bo Shen
2014-05-19 9:36 ` Josh Wu
0 siblings, 1 reply; 3+ messages in thread
From: Bo Shen @ 2014-05-16 10:02 UTC (permalink / raw)
To: u-boot
Hi Josh,
On 05/16/2014 04:52 PM, Josh Wu wrote:
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
> arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++
> include/configs/at91sam9m10g45ek.h | 1 -
> include/configs/at91sam9n12ek.h | 1 -
> include/configs/at91sam9x5ek.h | 1 -
> include/configs/sama5d3_xplained.h | 1 -
> include/configs/sama5d3xek.h | 1 -
> 6 files changed, 2 insertions(+), 5 deletions(-)
I think this patch should be split into two patches at least.
One is move the CONFIG_AT91FAMILY to SoC header (while not hardware.h).
The other is to remove multiple times definition CONFIG_AT91FAMILY.
Btw, can you add a little bit words into commit message.
Best Regards,
Bo Shen
> diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h b/arch/arm/include/asm/arch-at91/at91sam9x5.h
> index a471038..36a5cdf 100644
> --- a/arch/arm/include/asm/arch-at91/at91sam9x5.h
> +++ b/arch/arm/include/asm/arch-at91/at91sam9x5.h
> @@ -12,6 +12,8 @@
> #ifndef __AT91SAM9X5_H__
> #define __AT91SAM9X5_H__
>
> +#define CONFIG_AT91FAMILY /* it's a member of AT91 family */
> +
> /*
> * Peripheral identifiers/interrupts.
> */
> diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
> index 7a3c9b5..5d5fbe5 100644
> --- a/include/configs/at91sam9m10g45ek.h
> +++ b/include/configs/at91sam9m10g45ek.h
> @@ -22,7 +22,6 @@
> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
>
> #define CONFIG_AT91SAM9M10G45EK
> -#define CONFIG_AT91FAMILY
>
> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
> #define CONFIG_SETUP_MEMORY_TAGS
> diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
> index e23549d..ebfc26e 100644
> --- a/include/configs/at91sam9n12ek.h
> +++ b/include/configs/at91sam9n12ek.h
> @@ -19,7 +19,6 @@
> #define CONFIG_SYS_TEXT_BASE 0x26f00000
>
> #define CONFIG_ARM926EJS
> -#define CONFIG_AT91FAMILY
>
> /* ARM asynchronous clock */
> #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */
> diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
> index f0a6757..b2dd252 100644
> --- a/include/configs/at91sam9x5ek.h
> +++ b/include/configs/at91sam9x5ek.h
> @@ -18,7 +18,6 @@
> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
>
> #define CONFIG_AT91SAM9X5EK
> -#define CONFIG_AT91FAMILY
>
> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
> #define CONFIG_SETUP_MEMORY_TAGS
> diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
> index 41c946d..d7fb850 100644
> --- a/include/configs/sama5d3_xplained.h
> +++ b/include/configs/sama5d3_xplained.h
> @@ -18,7 +18,6 @@
> #define CONFIG_SYS_AT91_SLOW_CLOCK 32768
> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
>
> -#define CONFIG_AT91FAMILY
> #define CONFIG_ARCH_CPU_INIT
> #define CONFIG_SKIP_LOWLEVEL_INIT
> #define CONFIG_BOARD_EARLY_INIT_F
> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
> index b509c2d..72f0f27 100644
> --- a/include/configs/sama5d3xek.h
> +++ b/include/configs/sama5d3xek.h
> @@ -21,7 +21,6 @@
> #define CONFIG_SYS_AT91_SLOW_CLOCK 32768
> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
>
> -#define CONFIG_AT91FAMILY
> #define CONFIG_ARCH_CPU_INIT
>
> #ifndef CONFIG_SPL_BUILD
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] at91: move CONFIG_AT91FAMILY from board config file to hardware.h
2014-05-16 10:02 ` Bo Shen
@ 2014-05-19 9:36 ` Josh Wu
0 siblings, 0 replies; 3+ messages in thread
From: Josh Wu @ 2014-05-19 9:36 UTC (permalink / raw)
To: u-boot
Hi, Voice
Thanks for the review.
On 5/16/2014 6:02 PM, Bo Shen wrote:
> Hi Josh,
>
> On 05/16/2014 04:52 PM, Josh Wu wrote:
>> Signed-off-by: Josh Wu <josh.wu@atmel.com>
>> ---
>> arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 ++
>> include/configs/at91sam9m10g45ek.h | 1 -
>> include/configs/at91sam9n12ek.h | 1 -
>> include/configs/at91sam9x5ek.h | 1 -
>> include/configs/sama5d3_xplained.h | 1 -
>> include/configs/sama5d3xek.h | 1 -
>> 6 files changed, 2 insertions(+), 5 deletions(-)
>
> I think this patch should be split into two patches at least.
sure. that seems better.
> One is move the CONFIG_AT91FAMILY to SoC header (while not hardware.h).
> The other is to remove multiple times definition CONFIG_AT91FAMILY.
in v2, I will also remove CONFIG_AT91FAMILY in other board with use at91
SoC. like: corvus, cpu9260, ethernut5, vl_ma2sc.
>
> Btw, can you add a little bit words into commit message.
I will add commit message in v2. Thanks.
>
> Best Regards,
> Bo Shen
Best Regards,
Josh Wu
>
>> diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h
>> b/arch/arm/include/asm/arch-at91/at91sam9x5.h
>> index a471038..36a5cdf 100644
>> --- a/arch/arm/include/asm/arch-at91/at91sam9x5.h
>> +++ b/arch/arm/include/asm/arch-at91/at91sam9x5.h
>> @@ -12,6 +12,8 @@
>> #ifndef __AT91SAM9X5_H__
>> #define __AT91SAM9X5_H__
>>
>> +#define CONFIG_AT91FAMILY /* it's a member of AT91 family */
>> +
>> /*
>> * Peripheral identifiers/interrupts.
>> */
>> diff --git a/include/configs/at91sam9m10g45ek.h
>> b/include/configs/at91sam9m10g45ek.h
>> index 7a3c9b5..5d5fbe5 100644
>> --- a/include/configs/at91sam9m10g45ek.h
>> +++ b/include/configs/at91sam9m10g45ek.h
>> @@ -22,7 +22,6 @@
>> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz
>> crystal */
>>
>> #define CONFIG_AT91SAM9M10G45EK
>> -#define CONFIG_AT91FAMILY
>>
>> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
>> #define CONFIG_SETUP_MEMORY_TAGS
>> diff --git a/include/configs/at91sam9n12ek.h
>> b/include/configs/at91sam9n12ek.h
>> index e23549d..ebfc26e 100644
>> --- a/include/configs/at91sam9n12ek.h
>> +++ b/include/configs/at91sam9n12ek.h
>> @@ -19,7 +19,6 @@
>> #define CONFIG_SYS_TEXT_BASE 0x26f00000
>>
>> #define CONFIG_ARM926EJS
>> -#define CONFIG_AT91FAMILY
>>
>> /* ARM asynchronous clock */
>> #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock
>> xtal */
>> diff --git a/include/configs/at91sam9x5ek.h
>> b/include/configs/at91sam9x5ek.h
>> index f0a6757..b2dd252 100644
>> --- a/include/configs/at91sam9x5ek.h
>> +++ b/include/configs/at91sam9x5ek.h
>> @@ -18,7 +18,6 @@
>> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
>>
>> #define CONFIG_AT91SAM9X5EK
>> -#define CONFIG_AT91FAMILY
>>
>> #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
>> #define CONFIG_SETUP_MEMORY_TAGS
>> diff --git a/include/configs/sama5d3_xplained.h
>> b/include/configs/sama5d3_xplained.h
>> index 41c946d..d7fb850 100644
>> --- a/include/configs/sama5d3_xplained.h
>> +++ b/include/configs/sama5d3_xplained.h
>> @@ -18,7 +18,6 @@
>> #define CONFIG_SYS_AT91_SLOW_CLOCK 32768
>> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz
>> crystal */
>>
>> -#define CONFIG_AT91FAMILY
>> #define CONFIG_ARCH_CPU_INIT
>> #define CONFIG_SKIP_LOWLEVEL_INIT
>> #define CONFIG_BOARD_EARLY_INIT_F
>> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
>> index b509c2d..72f0f27 100644
>> --- a/include/configs/sama5d3xek.h
>> +++ b/include/configs/sama5d3xek.h
>> @@ -21,7 +21,6 @@
>> #define CONFIG_SYS_AT91_SLOW_CLOCK 32768
>> #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz
>> crystal */
>>
>> -#define CONFIG_AT91FAMILY
>> #define CONFIG_ARCH_CPU_INIT
>>
>> #ifndef CONFIG_SPL_BUILD
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-19 9:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-16 8:52 [U-Boot] [PATCH] at91: move CONFIG_AT91FAMILY from board config file to hardware.h Josh Wu
2014-05-16 10:02 ` Bo Shen
2014-05-19 9:36 ` Josh Wu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox