From patchwork Thu Sep 14 03:07:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 813690 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xt3Rp3z9Mz9t3V for ; Thu, 14 Sep 2017 13:09:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4C856C21EFB; Thu, 14 Sep 2017 03:09:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 30AF8C21F37; Thu, 14 Sep 2017 03:09:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 619E0C21F01; Thu, 14 Sep 2017 03:09:15 +0000 (UTC) Received: from eusmtp01.atmel.com (eusmtp01.atmel.com [212.144.249.243]) by lists.denx.de (Postfix) with ESMTPS id C737BC21EBE for ; Thu, 14 Sep 2017 03:09:13 +0000 (UTC) Received: from apsmtp01.atmel.com (10.168.254.31) by eusmtp01.atmel.com (10.145.145.31) with Microsoft SMTP Server id 14.3.235.1; Thu, 14 Sep 2017 05:08:23 +0200 Received: from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com (10.168.254.31) with Microsoft SMTP Server id 14.3.235.1; Thu, 14 Sep 2017 11:12:47 +0800 From: Wenyou Yang To: U-Boot Mailing List , Simon Glass , Heiko Schocher , Tom Rini , Andreas Date: Thu, 14 Sep 2017 11:07:40 +0800 Message-ID: <20170914030744.8956-2-wenyou.yang@microchip.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170914030744.8956-1-wenyou.yang@microchip.com> References: <20170914030744.8956-1-wenyou.yang@microchip.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v3 1/5] ARM: at91: Move CONFIG_AT91FAMILY option to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Wenyou Yang Move the CONFIG_AT91FAMILY option from include/mach/.h header file to Kconfig. Signed-off-by: Wenyou Yang --- Changes in v3: None Changes in v2: None 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 20f7eeaf09..2ca551044b 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 5c32e24ed0..96922c4e6b 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 e7224e432d..f9710a172f 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 25c85411e5..2ee3d68db3 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 d558f95141..0d32e3900f 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 78cc2a7a0a..7e2657faeb 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 */