ARM: at91: Move CONFIG_AT91FAMILY option to Kconfig

Move the CONFIG_AT91FAMILY option from include/mach/<soc>.h header
file to Kconfig.

Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index a70b956fbcc91974a48cc85ec96927e7c50a8f68..513963c7daf4e13be17d4d5dd834c0631ad2ff88 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,5 +1,8 @@
 if ARCH_AT91
 
+config AT91FAMILY
+       def_bool y
+
 choice
        prompt "Atmel AT91 board select"
        optional

diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h
index d177bdcae56cd72565ab057ee12743d1e3891175..d15fb7a2921eee47535cf29c1f6c719cc0930b93 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91rm9200.h
+++ b/arch/arm/mach-at91/include/mach/at91rm9200.h
@@ -6,7 +6,6 @@
 #ifndef __AT91RM9200_H__
 #define __AT91RM9200_H__
 
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 family */
 #define CONFIG_ARCH_CPU_INIT   /* we need arch_cpu_init() for hw timers */
 #define CONFIG_AT91_GPIO       /* and require always gpio features */
 

diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 1a4e84b050a94e0a4436b22b3532456b928c72cd..24d5dbd68a707b26ae9c510bb7a016ff87d57db4 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -18,11 +18,6 @@
 #ifndef AT91SAM9260_H
 #define AT91SAM9260_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h
index 914a3b0460e062e5dd2e7d62fd8bf4e97534002e..06403ce2254e2b9cc52224ad774f6697a924ffd2 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9261.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261.h
@@ -18,11 +18,6 @@
 #ifndef AT91SAM9261_H
 #define AT91SAM9261_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index 71675abf824faa4c6d60cea13077c783b7927197..be9a665db5bf28a1f10884e99f13698b6d37ae1f 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
@@ -14,11 +14,6 @@
 #ifndef AT91SAM9263_H
 #define AT91SAM9263_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index 5c32e24ed0f24559f2cf66124752053b25fc1351..96922c4e6bc7782d8d1782fe91b91a253262e6ee 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -12,11 +12,6 @@
 #ifndef AT91SAM9G45_H
 #define AT91SAM9G45_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h
index 70bbf4edaa432f4219db1acf9be4ed27c8f65414..8f9155c9ea68758c88c040cb19c8ce026ed06c77 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9rl.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h
@@ -14,11 +14,6 @@
 #ifndef AT91SAM9RL_H
 #define AT91SAM9RL_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h
index e7224e432d90fd96f9c5fc24d7385b965d3a95a8..f9710a172f8cd2113c5819eb60f72c6ceeb4c5b5 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91sam9x5.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9x5.h
@@ -12,8 +12,6 @@
 #ifndef __AT91SAM9X5_H__
 #define __AT91SAM9X5_H__
 
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 family */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/sama5d2.h b/arch/arm/mach-at91/include/mach/sama5d2.h
index 49283ed86b093eb8cc8a897e772e0f56d3a6aedd..a4ec0aac619cb6d8a98a3750f7f332791d6b5a56 100644 (file)
--- a/arch/arm/mach-at91/include/mach/sama5d2.h
+++ b/arch/arm/mach-at91/include/mach/sama5d2.h
@@ -10,11 +10,6 @@
 #ifndef __SAMA5D2_H
 #define __SAMA5D2_H
 
-/*
- * definitions to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* It's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h
index d558f95141f062ac964582a7685c431fa641d8b6..0d32e3900f92ac6554f3b917de9e630edd19b57e 100644 (file)
--- a/arch/arm/mach-at91/include/mach/sama5d3.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3.h
@@ -13,11 +13,6 @@
 #ifndef SAMA5D3_H
 #define SAMA5D3_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* it's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */

diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h
index 78cc2a7a0abde860a7d246976857ed85fb7236c9..7e2657faeb403be823de12e9b2d1c1235dd1e52d 100644 (file)
--- a/arch/arm/mach-at91/include/mach/sama5d4.h
+++ b/arch/arm/mach-at91/include/mach/sama5d4.h
@@ -10,11 +10,6 @@
 #ifndef __SAMA5D4_H
 #define __SAMA5D4_H
 
-/*
- * defines to be used in other places
- */
-#define CONFIG_AT91FAMILY      /* It's a member of AT91 */
-
 /*
  * Peripheral identifiers/interrupts.
  */