Skip to contentSkip to conversation

ARM: at91: add missed the AT91FAMILY and ARM926EJS in SoC header

PATCH New Josh Wu 3 participants 8 messages May 20, 2014 – May 26, 2014

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

Josh Wu

author
#0 lore raw

v2 cover ARM: at91: add missed the AT91FAMILY and ARM926EJS in SoC header

Add missed AT91FAMILY and ARM926EJS macro in at91sam9x5.h.

Now as all at91 SoC header defined AT91FAMILY and ARM926EJS, so we can remove the redundant definitions in all at91 board config files.

v1 -> v2:
1. add ARM926EJS in at91sam9x5 SoC header.
2. remove all redundant ARM926EJS in at91 board files.
3. remove redundant AT91FAMILY in corvus, cpu9260, ethernut5 and vl_ma2sc boards.

Josh Wu (3):
ARM: at91sam9x5: define the AT91FAMILY and ARM926EJS in SoC header
at91: remove redundant AT91FAMILY definition in board config file
ARM: at91: remove redundant ARM926EJS definition in board config files

 arch/arm/include/asm/arch-at91/at91sam9x5.h |    3 +++
 include/configs/at91sam9m10g45ek.h          |    1 -
 include/configs/at91sam9n12ek.h             |    3 ---
 include/configs/at91sam9x5ek.h              |    1 -
 include/configs/corvus.h                    |    2 --
 include/configs/cpu9260.h                   |    1 -
 include/configs/ethernut5.h                 |    2 --
 include/configs/sama5d3_xplained.h          |    1 -
 include/configs/sama5d3xek.h                |    1 -
 include/configs/vl_ma2sc.h                  |    2 --
 10 files changed, 3 insertions(+), 14 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/3 ARM: at91sam9x5: define the AT91FAMILY and ARM926EJS in SoC header

Signed-off-by Josh Wu <[email protected]>

---
v1 -> v2:
1. split the patch alone.
2. add missed ARM926EJS macro.

 arch/arm/include/asm/arch-at91/at91sam9x5.h |    3 +++
 1 file changed, 3 insertions(+)
arch/arm/include/asm/arch-at91/at91sam9x5.h +3 -0
index a471038..d49c184 100644
@@ -12,6 +12,9 @@
 #ifndef __AT91SAM9X5_H__
 #define __AT91SAM9X5_H__
 
+#define CONFIG_ARM926EJS	/* ARM926EJS Core */
+#define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
+
 /*
  * Peripheral identifiers/interrupts.
  */
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v2 1/3 ARM: at91sam9x5: define the AT91FAMILY and ARM926EJS in SoC header

Hi Josh,

Quoted 1 line · Josh Wu
Signed-off-by Josh Wu <[email protected]>

For the whole patch set.

Acked-by Bo Shen <[email protected]>
Quoted 14 lines

---
v1 -> v2:
1. split the patch alone.
2. add missed ARM926EJS macro.

  arch/arm/include/asm/arch-at91/at91sam9x5.h |    3 +++
  1 file changed, 3 insertions(+)
arch/arm/include/asm/arch-at91/at91sam9x5.h +0 -0
index a471038..d49c184 100644

arch/arm/include/asm/arch-at91/at91sam9x5.h line 20

Quoted 9 lines
arch/arm/include/asm/arch-at91/at91sam9x5.h +3 -0
@@ -12,6 +12,9 @@
  #ifndef __AT91SAM9X5_H__
  #define __AT91SAM9X5_H__
 
+#define CONFIG_ARM926EJS	/* ARM926EJS Core */
+#define CONFIG_AT91FAMILY	/* it's a member of AT91 family */
+
  /*
   * Peripheral identifiers/interrupts.
   */

Best Regards,
Bo Shen

#3 lore raw

PATCH v2 1/3 ARM: at91sam9x5: define the AT91FAMILY and ARM926EJS in SoC header

In reply to Josh Wu

Dear Josh Wu,

Quoted 9 lines · Josh Wu
Signed-off-by Josh Wu <[email protected]>

---
v1 -> v2:
1. split the patch alone.
2. add missed ARM926EJS macro.

arch/arm/include/asm/arch-at91/at91sam9x5.h | 3 +++

1 file changed, 3 insertions(+)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#4 lore raw

PATCH v2 2/3 at91: remove redundant AT91FAMILY definition in board config file

In reply to Josh Wu

Now the AT91FAMILY is already defined in the at91 SoC header. The at91 board config file will include the SoC header file.

So we can remove the redundant AT91FAMILY definition in at91 board config files.

Signed-off-by Josh Wu <[email protected]>

---
v1 -> v2:
1. modified more files, inclulde corvus, cpu9260, ethernut5 and vl_ma2sc board.

 include/configs/at91sam9m10g45ek.h |    1 -
 include/configs/at91sam9n12ek.h    |    1 -
 include/configs/at91sam9x5ek.h     |    1 -
 include/configs/corvus.h           |    2 --
 include/configs/cpu9260.h          |    1 -
 include/configs/ethernut5.h        |    1 -
 include/configs/sama5d3_xplained.h |    1 -
 include/configs/sama5d3xek.h       |    1 -
 include/configs/vl_ma2sc.h         |    1 -
 9 files changed, 10 deletions(-)
include/configs/at91sam9m10g45ek.h +0 -1
index ccfda71..af0415f 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/corvus.h +0 -2
index 959e188..2e118d7 100644
@@ -34,8 +34,6 @@
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
 
-#define CONFIG_AT91FAMILY
-
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs	*/
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
include/configs/cpu9260.h +0 -1
index 39f7062..1feaefd 100644
@@ -32,7 +32,6 @@
 
 #include <asm/arch/hardware.h>
 
-#define CONFIG_AT91FAMILY
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_BOARD_EARLY_INIT_F
include/configs/ethernut5.h +0 -1
index 480d867..89d668b 100644
@@ -24,7 +24,6 @@
 
 /* CPU information */
 #define CONFIG_ARM926EJS
-#define CONFIG_AT91FAMILY
 #define CONFIG_DISPLAY_CPUINFO		/* Display at console. */
 #define CONFIG_ARCH_CPU_INIT
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 516be85..b563732 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
include/configs/vl_ma2sc.h +0 -1
index 14c6e67..8e58ade 100644
@@ -14,7 +14,6 @@
 /*--------------------------------------------------------------------------*/
 
 #define CONFIG_ARM926EJS		/* This is an ARM926EJS Core	*/
-#define CONFIG_AT91FAMILY
 #define CONFIG_AT91SAM9263		/* It's an Atmel AT91SAM9263 SoC*/
 #define CONFIG_VL_MA2SC			/* on an VL_MA2SC Board	*/
 #define CONFIG_ARCH_CPU_INIT
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH v2 2/3 at91: remove redundant AT91FAMILY definition in board config file

Dear Josh Wu,

Quoted 12 lines · Josh Wu

Now the AT91FAMILY is already defined in the at91 SoC header. The at91 board config file will include the SoC header file.

So we can remove the redundant AT91FAMILY definition in at91 board config files.

Signed-off-by Josh Wu <[email protected]>

---
v1 -> v2:
1. modified more files, inclulde corvus, cpu9260, ethernut5 and vl_ma2sc board.

Quoted 10 lines
include/configs/at91sam9m10g45ek.h |    1 -
include/configs/at91sam9n12ek.h    |    1 -
include/configs/at91sam9x5ek.h     |    1 -
include/configs/corvus.h           |    2 --
include/configs/cpu9260.h          |    1 -
include/configs/ethernut5.h        |    1 -
include/configs/sama5d3_xplained.h |    1 -
include/configs/sama5d3xek.h       |    1 -
include/configs/vl_ma2sc.h         |    1 -
9 files changed, 10 deletions(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann

author
#6 lore raw

PATCH v2 3/3 ARM: at91: remove redundant ARM926EJS definition in board config files

In reply to Josh Wu

As at91 board config file will include the SoC header, so we can remove the ARM926EJS definition in board config files.

Signed-off-by Josh Wu <[email protected]>
---
 include/configs/at91sam9n12ek.h |    2 --
 include/configs/ethernut5.h     |    1 -
 include/configs/vl_ma2sc.h      |    1 -
 3 files changed, 4 deletions(-)
include/configs/at91sam9n12ek.h +0 -2
index ebfc26e..9b0e588 100644
@@ -18,8 +18,6 @@
 
 #define CONFIG_SYS_TEXT_BASE		0x26f00000
 
-#define CONFIG_ARM926EJS
-
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK	32768		/* slow clock xtal */
 #define CONFIG_SYS_AT91_MAIN_CLOCK	16000000	/* main clock xtal */
include/configs/ethernut5.h +0 -1
index 89d668b..c81fc44 100644
@@ -23,7 +23,6 @@
 #define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5
 
 /* CPU information */
-#define CONFIG_ARM926EJS
 #define CONFIG_DISPLAY_CPUINFO		/* Display at console. */
 #define CONFIG_ARCH_CPU_INIT
include/configs/vl_ma2sc.h +0 -1
index 8e58ade..bef821f 100644
@@ -13,7 +13,6 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define CONFIG_ARM926EJS		/* This is an ARM926EJS Core	*/
 #define CONFIG_AT91SAM9263		/* It's an Atmel AT91SAM9263 SoC*/
 #define CONFIG_VL_MA2SC			/* on an VL_MA2SC Board	*/
 #define CONFIG_ARCH_CPU_INIT
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH v2 3/3 ARM: at91: remove redundant ARM926EJS definition in board config files

Dear Josh Wu,

Quoted 10 lines · Josh Wu

As at91 board config file will include the SoC header, so we can remove the ARM926EJS definition in board config files.

Signed-off-by Josh Wu <[email protected]>

---

include/configs/at91sam9n12ek.h |    2 --
include/configs/ethernut5.h     |    1 -
include/configs/vl_ma2sc.h      |    1 -
3 files changed, 4 deletions(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann