From patchwork Mon Mar 25 17:39:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 230821 X-Patchwork-Delegate: afleming@freescale.com 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 DD90A2C009B for ; Tue, 26 Mar 2013 04:42:16 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C2BCA4A2D3; Mon, 25 Mar 2013 18:41:32 +0100 (CET) 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 1Exi79o4ykzq; Mon, 25 Mar 2013 18:41:32 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5B6A74A2A8; Mon, 25 Mar 2013 18:40:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3A3634A16E for ; Mon, 25 Mar 2013 18:40:26 +0100 (CET) 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 RXj+F02mtdfS for ; Mon, 25 Mar 2013 18:40:24 +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 co9outboundpool.messaging.microsoft.com (co9ehsobe004.messaging.microsoft.com [207.46.163.27]) by theia.denx.de (Postfix) with ESMTPS id D1BC64A1E2 for ; Mon, 25 Mar 2013 18:40:02 +0100 (CET) Received: from mail40-co9-R.bigfish.com (10.236.132.228) by CO9EHSOBE008.bigfish.com (10.236.130.71) with Microsoft SMTP Server id 14.1.225.23; Mon, 25 Mar 2013 17:40:00 +0000 Received: from mail40-co9 (localhost [127.0.0.1]) by mail40-co9-R.bigfish.com (Postfix) with ESMTP id CA489100203 for ; Mon, 25 Mar 2013 17:40:00 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1202h1e76h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1155h) Received: from mail40-co9 (localhost.localdomain [127.0.0.1]) by mail40-co9 (MessageSwitch) id 1364233198922843_27899; Mon, 25 Mar 2013 17:39:58 +0000 (UTC) Received: from CO9EHSMHS008.bigfish.com (unknown [10.236.132.232]) by mail40-co9.bigfish.com (Postfix) with ESMTP id D85687C0054 for ; Mon, 25 Mar 2013 17:39:58 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS008.bigfish.com (10.236.130.18) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 25 Mar 2013 17:39:58 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server (TLS) id 14.2.328.11; Mon, 25 Mar 2013 17:39:58 +0000 Received: from oslab-l1.am.freescale.net ([10.214.80.134]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r2PHdfiw011727; Mon, 25 Mar 2013 10:39:56 -0700 From: York Sun To: Date: Mon, 25 Mar 2013 10:39:39 -0700 Message-ID: <1364233180-31149-17-git-send-email-yorksun@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364233180-31149-1-git-send-email-yorksun@freescale.com> References: <1364233180-31149-1-git-send-email-yorksun@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Cc: u-boot@lists.denx.de Subject: [U-Boot] [Patch v2, batch 3 17/17] powerpc/srio: Remove duplicate macro definitions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de From: Liu Gang There are some duplicate SRIO macro definitions should be remove in below header files: include/configs/P3041DS.h include/configs/P4080DS.h include/configs/P5020DS.h Signed-off-by: Liu Gang --- include/configs/P3041DS.h | 4 ---- include/configs/P4080DS.h | 4 ---- include/configs/P5020DS.h | 4 ---- 3 files changed, 12 deletions(-) diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index a0a4a3c..468cc67 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -40,10 +40,6 @@ #define CONFIG_SRIO2 /* SRIO port 2 */ #define CONFIG_SYS_DPAA_RMAN -#define CONFIG_SYS_SRIO -#define CONFIG_SRIO1 /* SRIO port 1 */ -#define CONFIG_SRIO2 /* SRIO port 2 */ - #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #include "corenet_ds.h" diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index 257258b..7a8373a 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -36,10 +36,6 @@ #define CONFIG_SRIO1 /* SRIO port 1 */ #define CONFIG_SRIO2 /* SRIO port 2 */ -#define CONFIG_SYS_SRIO -#define CONFIG_SRIO1 /* SRIO port 1 */ -#define CONFIG_SRIO2 /* SRIO port 2 */ - #define CONFIG_ICS307_REFCLK_HZ 33333000 /* ICS307 ref clk freq */ #include "corenet_ds.h" diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index a32b610..6a4bee9 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -41,10 +41,6 @@ #define CONFIG_SYS_FSL_RAID_ENGINE #define CONFIG_SYS_DPAA_RMAN -#define CONFIG_SYS_SRIO -#define CONFIG_SRIO1 /* SRIO port 1 */ -#define CONFIG_SRIO2 /* SRIO port 2 */ - #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #include "corenet_ds.h"