From: Wenyou Yang wenyou.yang@atmel.com
Move the CONFIG_AT91FAMILY option from include/mach/<soc>.h header file to Kconfig.
Signed-off-by: Wenyou Yang wenyou.yang@microchip.com ---
arch/arm/mach-at91/Kconfig | 3 +++ arch/arm/mach-at91/include/mach/at91rm9200.h | 1 - arch/arm/mach-at91/include/mach/at91sam9260.h | 5 ----- arch/arm/mach-at91/include/mach/at91sam9261.h | 5 ----- arch/arm/mach-at91/include/mach/at91sam9263.h | 5 ----- arch/arm/mach-at91/include/mach/at91sam9g45.h | 5 ----- arch/arm/mach-at91/include/mach/at91sam9rl.h | 5 ----- arch/arm/mach-at91/include/mach/at91sam9x5.h | 2 -- arch/arm/mach-at91/include/mach/sama5d2.h | 5 ----- arch/arm/mach-at91/include/mach/sama5d3.h | 5 ----- arch/arm/mach-at91/include/mach/sama5d4.h | 5 ----- 11 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 9f39e210b1..9863876090 100644 --- 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 d177bdcae5..d15fb7a292 100644 --- 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 1a4e84b050..24d5dbd68a 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9260.h +++ b/arch/arm/mach-at91/include/mach/at91sam9260.h @@ -19,11 +19,6 @@ #define AT91SAM9260_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h index 914a3b0460..06403ce225 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9261.h +++ b/arch/arm/mach-at91/include/mach/at91sam9261.h @@ -19,11 +19,6 @@ #define AT91SAM9261_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h index 71675abf82..be9a665db5 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9263.h +++ b/arch/arm/mach-at91/include/mach/at91sam9263.h @@ -15,11 +15,6 @@ #define AT91SAM9263_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h index c3b3a8fdc8..60a401690d 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9g45.h +++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h @@ -13,11 +13,6 @@ #define AT91SAM9G45_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h index 70bbf4edaa..8f9155c9ea 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9rl.h +++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h @@ -15,11 +15,6 @@ #define AT91SAM9RL_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/at91sam9x5.h b/arch/arm/mach-at91/include/mach/at91sam9x5.h index 8f460f016d..e9b25f0372 100644 --- 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 9fe572621c..299d416200 100644 --- a/arch/arm/mach-at91/include/mach/sama5d2.h +++ b/arch/arm/mach-at91/include/mach/sama5d2.h @@ -11,11 +11,6 @@ #define __SAMA5D2_H
/* - * definitions to be used in other places - */ -#define CONFIG_AT91FAMILY /* It's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* FIQ Interrupt ID */ diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h index eb9f7e5658..04bd30ad27 100644 --- a/arch/arm/mach-at91/include/mach/sama5d3.h +++ b/arch/arm/mach-at91/include/mach/sama5d3.h @@ -14,11 +14,6 @@ #define SAMA5D3_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* it's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* Advanced Interrupt Controller (FIQ) */ diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h index 90e7f01464..559146815b 100644 --- a/arch/arm/mach-at91/include/mach/sama5d4.h +++ b/arch/arm/mach-at91/include/mach/sama5d4.h @@ -11,11 +11,6 @@ #define __SAMA5D4_H
/* - * defines to be used in other places - */ -#define CONFIG_AT91FAMILY /* It's a member of AT91 */ - -/* * Peripheral identifiers/interrupts. */ #define ATMEL_ID_FIQ 0 /* FIQ Interrupt */