From patchwork Fri Nov 13 05:43:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 56485 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp836126lbb; Thu, 12 Nov 2015 21:45:03 -0800 (PST) X-Received: by 10.194.23.33 with SMTP id j1mr22995303wjf.4.1447393503535; Thu, 12 Nov 2015 21:45:03 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ey10si23473154wjd.117.2015.11.12.21.45.03; Thu, 12 Nov 2015 21:45:03 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65E0B4B9FA; Fri, 13 Nov 2015 06:44:37 +0100 (CET) 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 7zIvHcCEkaWs; Fri, 13 Nov 2015 06:44:37 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7118C4BA3D; Fri, 13 Nov 2015 06:44:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CDAA94BA00 for ; Fri, 13 Nov 2015 06:44:09 +0100 (CET) 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 QsqviC-Y2nc4 for ; Fri, 13 Nov 2015 06:44:09 +0100 (CET) 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 arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by theia.denx.de (Postfix) with ESMTPS id 61C054B9F5 for ; Fri, 13 Nov 2015 06:44:03 +0100 (CET) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id tAD5htjQ023725; Thu, 12 Nov 2015 23:43:55 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id tAD5htM2023140; Thu, 12 Nov 2015 23:43:55 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.224.2; Thu, 12 Nov 2015 23:43:55 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id tAD5hsjn029188; Thu, 12 Nov 2015 23:43:54 -0600 From: Nishanth Menon To: Simon Glass , Tom Rini , Masahiro Yamada , Daniel Schwierzeck , Michal Marek , Stefan Roese , Bin Meng Date: Thu, 12 Nov 2015 23:43:38 -0600 Message-ID: <1447393422-4169-9-git-send-email-nm@ti.com> X-Mailer: git-send-email 2.6.2.402.g2635c2b In-Reply-To: <1447393422-4169-1-git-send-email-nm@ti.com> References: <1447393422-4169-1-git-send-email-nm@ti.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Denis Peter , =?UTF-8?q?David=20M=C3=BCller?= Subject: [U-Boot] [PATCH V2 08/12] board: mpl: Move common headers to board-common directory X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Header files can be located in a generic location without needing to reference them with ../common/ Generated with the following script #!/bin/bash vendor=board/mpl common=$vendor/common cfiles=`git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep c$` headers=`git grep "../common" $vendor|grep "#include"|cut -d '"' -f2|sort -u|grep h$` mkdir -p $common/include/board-common set -x for header in $headers do echo "processing $header in $common" hbase=`basename $header` git mv $common/$hbase $common/include/board-common sed -i -e "s/\"..\/common\/$hbase\"//g" $vendor/*/*.[chS] sed -i -e "s/\"$hbase\"//g" $vendor/common/*.[chS] done Cc: Bin Meng Cc: "David Müller" Cc: Denis Peter Signed-off-by: Nishanth Menon --- board/mpl/common/common_util.c | 2 +- board/mpl/common/{ => include/board-common}/common_util.h | 0 board/mpl/common/{ => include/board-common}/isa.h | 0 board/mpl/common/isa.c | 2 +- board/mpl/common/kbd.c | 2 +- board/mpl/common/pci.c | 2 +- board/mpl/mip405/cmd_mip405.c | 2 +- board/mpl/mip405/mip405.c | 2 +- board/mpl/pip405/cmd_pip405.c | 2 +- board/mpl/pip405/pip405.c | 4 ++-- board/mpl/vcma9/cmd_vcma9.c | 2 +- board/mpl/vcma9/vcma9.c | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename board/mpl/common/{ => include/board-common}/common_util.h (100%) rename board/mpl/common/{ => include/board-common}/isa.h (100%) diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 6b96bd526e80..5626ecdf8b48 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -8,7 +8,7 @@ #include #include #include -#include "common_util.h" +#include #include #include #include diff --git a/board/mpl/common/common_util.h b/board/mpl/common/include/board-common/common_util.h similarity index 100% rename from board/mpl/common/common_util.h rename to board/mpl/common/include/board-common/common_util.h diff --git a/board/mpl/common/isa.h b/board/mpl/common/include/board-common/isa.h similarity index 100% rename from board/mpl/common/isa.h rename to board/mpl/common/include/board-common/isa.h diff --git a/board/mpl/common/isa.c b/board/mpl/common/isa.c index 54ec66bd45b0..83628bba5d58 100644 --- a/board/mpl/common/isa.c +++ b/board/mpl/common/isa.c @@ -10,7 +10,7 @@ #include #include #include -#include "isa.h" +#include #include "piix4_pci.h" #include "kbd.h" #include "video.h" diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c index 1da72c53989c..cdcee1907dca 100644 --- a/board/mpl/common/kbd.c +++ b/board/mpl/common/kbd.c @@ -10,7 +10,7 @@ #include #include #include -#include "isa.h" +#include #include "kbd.h" diff --git a/board/mpl/common/pci.c b/board/mpl/common/pci.c index cd969cb5182d..ff1822d1cc6f 100644 --- a/board/mpl/common/pci.c +++ b/board/mpl/common/pci.c @@ -10,7 +10,7 @@ #include #include -#include "isa.h" +#include #ifdef CONFIG_405GP #ifdef CONFIG_PCI diff --git a/board/mpl/mip405/cmd_mip405.c b/board/mpl/mip405/cmd_mip405.c index ca6f0affe48f..d71e6dbd3fbc 100644 --- a/board/mpl/mip405/cmd_mip405.c +++ b/board/mpl/mip405/cmd_mip405.c @@ -10,7 +10,7 @@ #include #include #include "mip405.h" -#include "../common/common_util.h" +#include extern void print_mip405_info(void); diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index 4a0d6966a6fa..e762f57ea1a1 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -51,7 +51,7 @@ #include #include #include -#include "../common/common_util.h" +#include #include #include #include diff --git a/board/mpl/pip405/cmd_pip405.c b/board/mpl/pip405/cmd_pip405.c index 43b182e57ebb..5a6e49ef07dd 100644 --- a/board/mpl/pip405/cmd_pip405.c +++ b/board/mpl/pip405/cmd_pip405.c @@ -10,7 +10,7 @@ #include #include #include "pip405.h" -#include "../common/common_util.h" +#include extern void print_pip405_info(void); diff --git a/board/mpl/pip405/pip405.c b/board/mpl/pip405/pip405.c index 7c7690ff555b..e46e8be9d9dd 100644 --- a/board/mpl/pip405/pip405.c +++ b/board/mpl/pip405/pip405.c @@ -12,8 +12,8 @@ #include #include #include -#include "../common/isa.h" -#include "../common/common_util.h" +#include +#include DECLARE_GLOBAL_DATA_PTR; diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c index c2d62e4aaf4b..c70ae90e0b06 100644 --- a/board/mpl/vcma9/cmd_vcma9.c +++ b/board/mpl/vcma9/cmd_vcma9.c @@ -12,7 +12,7 @@ #include #include #include "vcma9.h" -#include "../common/common_util.h" +#include #if defined(CONFIG_CS8900) #include <../drivers/net/cs8900.h> diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index 43a3d47d2b03..2ddba0539837 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -16,7 +16,7 @@ #include #include "vcma9.h" -#include "../common/common_util.h" +#include DECLARE_GLOBAL_DATA_PTR;