Skip to contentSkip to conversation

at91: move CONFIG_AT91FAMILY from board config file to hardware.h

PATCH New Josh Wu 2 participants 3 messages May 16, 2014 – May 19, 2014

Subsystems (2)
Arm (32-bit) Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Josh Wu

author
#0 lore raw

PATCH 1/1 at91: move CONFIG_AT91FAMILY from board config file to hardware.h

Signed-off-by Josh Wu <[email protected]>
---
 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(-)
arch/arm/include/asm/arch-at91/at91sam9x5.h +2 -0
index a471038..36a5cdf 100644
@@ -12,6 +12,8 @@
 #ifndef __AT91SAM9X5_H__
 #define __AT91SAM9X5_H__
 
+#define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
+
 /*
  * Peripheral identifiers/interrupts.
  */
include/configs/at91sam9m10g45ek.h +0 -1
index 7a3c9b5..5d5fbe5 100644
@@ -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
include/configs/at91sam9n12ek.h +0 -1
index e23549d..ebfc26e 100644
@@ -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 */
include/configs/at91sam9x5ek.h +0 -1
index f0a6757..b2dd252 100644
@@ -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
include/configs/sama5d3_xplained.h +0 -1
index 41c946d..d7fb850 100644
@@ -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
include/configs/sama5d3xek.h +0 -1
index b509c2d..72f0f27 100644
@@ -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
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 at91: move CONFIG_AT91FAMILY from board config file to hardware.h

Hi Josh,

Quoted 9 lines · Josh Wu
Signed-off-by Josh Wu <[email protected]>
---
  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

Quoted 74 lines
arch/arm/include/asm/arch-at91/at91sam9x5.h +2 -0
index a471038..36a5cdf 100644
@@ -12,6 +12,8 @@
  #ifndef __AT91SAM9X5_H__
  #define __AT91SAM9X5_H__
 
+#define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
+
  /*
   * Peripheral identifiers/interrupts.
   */
include/configs/at91sam9m10g45ek.h +0 -1
index 7a3c9b5..5d5fbe5 100644
@@ -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
include/configs/at91sam9n12ek.h +0 -1
index e23549d..ebfc26e 100644
@@ -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 */
include/configs/at91sam9x5ek.h +0 -1
index f0a6757..b2dd252 100644
@@ -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
include/configs/sama5d3_xplained.h +0 -1
index 41c946d..d7fb850 100644
@@ -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
include/configs/sama5d3xek.h +0 -1
index b509c2d..72f0f27 100644
@@ -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
author
#2 lore raw

PATCH 1/1 at91: move CONFIG_AT91FAMILY from board config file to hardware.h

Hi, Voice

Thanks for the review.

Quoted 13 lines · Bo Shen

Hi Josh,

Quoted 9 lines · Josh Wu
Signed-off-by Josh Wu <[email protected]>
---
  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(-)
Quoted 1 line

I think this patch should be split into two patches at least.

sure. that seems better.

Quoted 2 lines

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.

Quoted 2 lines

Btw, can you add a little bit words into commit message.

I will add commit message in v2. Thanks.

Quoted 3 lines

Best Regards,
Bo Shen

Best Regards,
Josh Wu

Quoted 85 lines
Quoted 84 lines
arch/arm/include/asm/arch-at91/at91sam9x5.h +2 -0
index a471038..36a5cdf 100644
@@ -12,6 +12,8 @@
  #ifndef __AT91SAM9X5_H__
  #define __AT91SAM9X5_H__
 
+#define CONFIG_AT91FAMILY    /* it's a member of AT91 family */
+
  /*
   * Peripheral identifiers/interrupts.
   */
include/configs/at91sam9m10g45ek.h +0 -0
index 7a3c9b5..5d5fbe5 100644
@@ -22,7 +22,6 @@
  #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz

crystal */

  #define CONFIG_AT91SAM9M10G45EK
include/configs/at91sam9m10g45ek.h +0 -1
-#define CONFIG_AT91FAMILY
 
  #define CONFIG_CMDLINE_TAG        /* enable passing of ATAGs    */
  #define CONFIG_SETUP_MEMORY_TAGS
include/configs/at91sam9n12ek.h +0 -1
index e23549d..ebfc26e 100644
@@ -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 */

include/configs/at91sam9x5ek.h +0 -1
index f0a6757..b2dd252 100644
@@ -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
include/configs/sama5d3_xplained.h +0 -0
index 41c946d..d7fb850 100644
@@ -18,7 +18,6 @@
  #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
  #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz

crystal */

include/configs/sama5d3_xplained.h +0 -1
-#define CONFIG_AT91FAMILY
  #define CONFIG_ARCH_CPU_INIT
  #define CONFIG_SKIP_LOWLEVEL_INIT
  #define CONFIG_BOARD_EARLY_INIT_F
include/configs/sama5d3xek.h +0 -0
index b509c2d..72f0f27 100644
@@ -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