From patchwork Fri Jan 3 10:10:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3430991 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D0AC5C02DC for ; Fri, 3 Jan 2014 10:44:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D7C020122 for ; Fri, 3 Jan 2014 10:44:51 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D86BA200F3 for ; Fri, 3 Jan 2014 10:44:49 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vz1lx-00004s-Ew; Fri, 03 Jan 2014 10:14:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vz1l7-0003Qn-7J; Fri, 03 Jan 2014 10:13:41 +0000 Received: from mail-ee0-f51.google.com ([74.125.83.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vz1ji-0003D6-Lz for linux-arm-kernel@lists.infradead.org; Fri, 03 Jan 2014 10:12:15 +0000 Received: by mail-ee0-f51.google.com with SMTP id b15so6678040eek.38 for ; Fri, 03 Jan 2014 02:11:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:content-type; bh=AMNP2B58kYdZIrm1SgUd0eOGfVbiMey7RWXX9c+ZQWA=; b=DCQ9HAOy2sDgWx6bmViKNuPzgMZwb56CQbMnNrnQ+0vzhG4sQezhkqRRH34Q9y5I4X 7j7pfV15eemPLUKFoG9PoSd/pe0AIud0GIWRaYGe3iUtwTakHJ3Gaq9eDR1N0SyUJH0G beRSfmuv1jHQJ+G5u5DNisSaN8PTN4Pehf+I2PwdOQtViQChjTpYkXef4kRlvYZvkxJS w4D+WlLpoJGcBq5C90LROyLRenIKpKoS4KV2THV+0/1E40+MA58fiLL5IMz8dTjky2fe ln5E36qEze2zQqRv7bNfjoQaKfckzfvcoW40C5ToZrC72FuTVtM9DD4njcEy4o3BgXqW yiIA== X-Gm-Message-State: ALoCoQnlpdpHSOl82NcA9yTFgHby2xTipNdZWMZUqm+JrB5bLGsAfr1XdOyYdc9Ed58jhZ29XAVM X-Received: by 10.15.64.4 with SMTP id n4mr934293eex.99.1388743912621; Fri, 03 Jan 2014 02:11:52 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id j46sm143597582eew.18.2014.01.03.02.11.51 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 03 Jan 2014 02:11:51 -0800 (PST) From: Michal Simek To: Michal Simek , u-boot@lists.denx.de, Joe Hershberger , linux-arm-kernel@lists.infradead.org, Albert Aribaud , Tom Rini Subject: [PATCH v1 14/24] zynq: Add GEM0, GEM1 configs support Date: Fri, 3 Jan 2014 11:10:59 +0100 Message-Id: X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140103_051214_896447_D715AE81 X-CRM114-Status: GOOD ( 12.12 ) X-Spam-Score: -1.9 (-) Cc: Jagannadha Sutradharudu Teki X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jagannadha Sutradharudu Teki Zynq ethernet controller support two GEM's like CONFIG_ZYNQ_GEM0 and CONFIG_ZYNQ_GEM1 enabled both so-that the respective board will define these macros based on their usage. Signed-off-by: Jagannadha Sutradharudu Teki Signed-off-by: Michal Simek --- Changes in v1: None include/configs/zynq.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 1.8.2.3 diff --git a/include/configs/zynq.h b/include/configs/zynq.h index 6632223..2f8f4ab 100644 --- a/include/configs/zynq.h +++ b/include/configs/zynq.h @@ -42,10 +42,16 @@ #endif /* Ethernet driver */ -#define CONFIG_NET_MULTI -#define CONFIG_ZYNQ_GEM #define CONFIG_ZYNQ_GEM0 #define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 +#if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1) +# define CONFIG_NET_MULTI +# define CONFIG_ZYNQ_GEM +# define CONFIG_MII +# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN +# define CONFIG_PHYLIB +# define CONFIG_PHY_MARVELL +#endif #define CONFIG_ZYNQ_SPI /* SPI */ @@ -89,12 +95,6 @@ #define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_MAY_FAIL -/* MII and Phylib */ -#define CONFIG_MII -#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN -#define CONFIG_PHYLIB -#define CONFIG_PHY_MARVELL - /* Environment */ #define CONFIG_ENV_SIZE 0x10000 /* Env. sector size */ #define CONFIG_ENV_IS_NOWHERE