From patchwork Fri Oct 14 14:34:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lei Wen X-Patchwork-Id: 119806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 9E943B6FA6 for ; Sat, 15 Oct 2011 01:35:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3418128CC6; Fri, 14 Oct 2011 16:35:48 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ubJfzLe2loGR; Fri, 14 Oct 2011 16:35:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3F0E028CC8; Fri, 14 Oct 2011 16:35:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D14828CB5 for ; Fri, 14 Oct 2011 16:35:14 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jpfTdomibIGl for ; Fri, 14 Oct 2011 16:35:13 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na3sys009aog122.obsmtp.com (na3sys009aog122.obsmtp.com [74.125.149.147]) by theia.denx.de (Postfix) with SMTP id 0F2ED28CA1 for ; Fri, 14 Oct 2011 16:35:11 +0200 (CEST) Received: from MSI-MTA.marvell.com ([65.219.4.132]) by na3sys009aob122.postini.com ([74.125.148.12]) with SMTP; Fri, 14 Oct 2011 07:35:12 PDT Received: from maili.marvell.com ([10.68.76.51]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 14 Oct 2011 07:34:54 -0700 Received: from localhost (unknown [10.38.16.130]) by maili.marvell.com (Postfix) with ESMTP id 551E68A002; Fri, 14 Oct 2011 07:34:54 -0700 (PDT) From: Lei Wen To: Prafulla Wadaskar , Wolfgang Denk , u-boot@lists.denx.de Date: Fri, 14 Oct 2011 07:34:27 -0700 Message-Id: <1318602869-13390-4-git-send-email-leiwen@marvell.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1317565013-22438-1-git-send-email-leiwen@marvell.com> References: <1317565013-22438-1-git-send-email-leiwen@marvell.com> X-OriginalArrivalTime: 14 Oct 2011 14:34:54.0531 (UTC) FILETIME=[70870130:01CC8A7E] Subject: [U-Boot] [PATCH V2 3/5] ARM: kirkwood: reduce dependence of including platform file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de For files like the drivers/serial/serial.c, it must include the platform file, as the CONFIG_SYS_NS16550_COM1 must reference to the definition in the platform definition files. Include the platform definition file in the config file, so that it would decouple the dependence for the driver files. Signed-off-by: Lei Wen --- Changelog: V2: no change arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 ++ arch/arm/cpu/arm926ejs/kirkwood/dram.c | 2 ++ arch/arm/cpu/arm926ejs/kirkwood/mpp.c | 2 ++ arch/arm/cpu/arm926ejs/kirkwood/timer.c | 1 + arch/arm/include/asm/arch-kirkwood/config.h | 1 + arch/arm/include/asm/arch-kirkwood/kirkwood.h | 6 ------ board/Marvell/guruplug/guruplug.c | 1 + board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 1 + board/Marvell/openrd/openrd.c | 1 + board/Marvell/rd6281a/rd6281a.c | 1 + board/Marvell/sheevaplug/sheevaplug.c | 1 + board/keymile/km_arm/km_arm.c | 1 + drivers/gpio/kw_gpio.c | 1 + drivers/net/mvgbe.c | 2 ++ drivers/spi/kirkwood_spi.c | 1 + drivers/usb/host/ehci-kirkwood.c | 1 + 16 files changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index b4a4c04..8f04ddb 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c index 2441554..181b3e7 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c @@ -24,6 +24,8 @@ #include #include +#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c index b2f0ad5..3da6c98 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c @@ -10,6 +10,8 @@ */ #include +#include +#include #include #include diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c index b4f6cf8..a98f54c 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c @@ -22,6 +22,7 @@ */ #include +#include #include #define UBOOT_CNTR 0 /* counter to use for uboot timer */ diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index b393b1a..f17f82d 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -39,6 +39,7 @@ #error "SOC Name not defined" #endif /* CONFIG_KW88F6281 */ +#include #define CONFIG_ARM926EJS 1 /* Basic Architecture */ #define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */ diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 3c843a0..0035ed5 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -27,13 +27,7 @@ #ifndef _ASM_ARCH_KIRKWOOD_H #define _ASM_ARCH_KIRKWOOD_H -#ifndef __ASSEMBLY__ -#include -#include -#endif /* __ASSEMBLY__ */ - #if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131) -#include /* SOC specific definations */ #define INTREG_BASE 0xd0000000 diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c index 1f0e67a..057c558 100644 --- a/board/Marvell/guruplug/guruplug.c +++ b/board/Marvell/guruplug/guruplug.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include "guruplug.h" diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c index 80fd20b..4c41f3b 100644 --- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c +++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include "mv88f6281gtw_ge.h" diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index 87939de..2a10e69 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include "openrd.h" diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c index ecdea82..9c768bf 100644 --- a/board/Marvell/rd6281a/rd6281a.c +++ b/board/Marvell/rd6281a/rd6281a.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include "rd6281a.h" diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c index d7dc80c..71e6793 100644 --- a/board/Marvell/sheevaplug/sheevaplug.c +++ b/board/Marvell/sheevaplug/sheevaplug.c @@ -24,6 +24,7 @@ #include #include +#include #include #include #include "sheevaplug.h" diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 67f158c..6ef5e5d 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c index 56383c2..c86c28f 100644 --- a/drivers/gpio/kw_gpio.c +++ b/drivers/gpio/kw_gpio.c @@ -31,6 +31,7 @@ #include #include +#include #include #include diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index c701f43..c7f7446 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -32,8 +32,10 @@ #include #include #include +#include #include #include +#include #include #if defined(CONFIG_KIRKWOOD) diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c index a1c3070..6f502f0 100644 --- a/drivers/spi/kirkwood_spi.c +++ b/drivers/spi/kirkwood_spi.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/usb/host/ehci-kirkwood.c b/drivers/usb/host/ehci-kirkwood.c index 5570fc6..6300587 100644 --- a/drivers/usb/host/ehci-kirkwood.c +++ b/drivers/usb/host/ehci-kirkwood.c @@ -27,6 +27,7 @@ #include #include "ehci.h" #include "ehci-core.h" +#include #include #define rdl(off) readl(KW_USB20_BASE + (off))