From patchwork Thu Dec 17 12:05:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 558274 X-Patchwork-Delegate: monstr@monstr.eu 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 86E49140213 for ; Thu, 17 Dec 2015 23:16:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b=T89QGm4g; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 86684A7579; Thu, 17 Dec 2015 13:07:56 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 l7FmpeztyG1o; Thu, 17 Dec 2015 13:07:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CDD743A09; Thu, 17 Dec 2015 13:07:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4288739D8 for ; Thu, 17 Dec 2015 13:06:10 +0100 (CET) X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 G1leYapTJgre for ; Thu, 17 Dec 2015 13:06:10 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=SKIP(-1.5) (only DNSBL check requested) Received: from mail-wm0-f50.google.com (unknown [74.125.82.50]) by theia.denx.de (Postfix) with ESMTPS id E2C8C39BA for ; Thu, 17 Dec 2015 13:05:50 +0100 (CET) Received: by mail-wm0-f50.google.com with SMTP id p187so18016797wmp.1 for ; Thu, 17 Dec 2015 04:05:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=utbWa/yn+G6uiVFyD3ehL9p6zGDsmow0WEsYV6eEHHc=; b=T89QGm4gwdjC/OQ8ZCc8/TG+CYoZ6Vesue5OvjNWvzdbQQOjTPBCoCF9w4WBAt74Jh kCrYtbeEd4yrouIOj1s0xTbNRrHLA0wQcu1+JHghto1x/EYzt4lTIAzIX6BR7oCGsM0T 1l3J6khLGtQ3k2xAT6bkjCFk4qxCiJdeEo0YI0S5Ci11/Ad4I7beFoB3Fg+GEkw4Nbun YD5bEpyKUbSWsvchU1twcq0UlOZ4m7xCC54kAAmRfEW2AN3FuJxQADo96ewOpkXhCGkk Rix6anyQHAmHCJIIDuz9hzPX/eZUvxKkkmq2FAK8xEDhAG/3KqYEQaKuEIaTY4AdVkRE ia2g== 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; bh=utbWa/yn+G6uiVFyD3ehL9p6zGDsmow0WEsYV6eEHHc=; b=NwmEVBI0SIDDLhm0fAKNVfg+roO8riV2hwcGDbE6zwDl9j97rAmxSIMKjdTf0eBf8k h0xgkiEyT7dg457GQjHQY2B40I2ixOqIIjSX1dl+2IgKV+iZzXswJOKEzBcUpAM/1R2f 64pipqY2l+cfq5DDyyfr/mYmBpPHJEIl1Se5QaFK7uEVkkWIklSQWungygCx/t3YAR3y 7JwMjI4+HM2WePlZlvTgg+A06ni7xSxsvUhZNBsO8xxTMll0FwgiR1i4rURC+iQAOCOz XehE8f64d40YJs+EUmlheOAxB+U8c/TukysR3SjvWTawhnrNv5Lxa9Zpu49b5UKUw3pH szxw== X-Gm-Message-State: ALoCoQkOfxchhQGmVgaHJoGzj2EhwBwn2/N7y2Yi9vVHPn29RpN9ntTlGOtX+MIH/NfyDWgiB7fzxOpjLqbt/kKl0TzcGXiIiQ== X-Received: by 10.194.115.129 with SMTP id jo1mr57084889wjb.28.1450353929860; Thu, 17 Dec 2015 04:05:29 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id 198sm2061094wmr.18.2015.12.17.04.05.28 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 17 Dec 2015 04:05:29 -0800 (PST) From: Michal Simek To: u-boot@lists.denx.de Date: Thu, 17 Dec 2015 13:05:08 +0100 Message-Id: <5e6e893d8183e59e797c30445dd96101af1a5741.1450353904.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Cc: Joe Hershberger Subject: [U-Boot] [PATCH v2 11/11] net: Add axi emac to Kconfig 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Also add dependency on PHYLIB and MII which is required. Clean PHYLIB dependency from the driver too. Signed-off-by: Michal Simek Acked-by: Joe Hershberger --- Changes in v2: None drivers/net/Kconfig | 8 ++++++++ drivers/net/xilinx_axi_emac.c | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ae5e78dd3449..9dc106cc93b7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -101,6 +101,14 @@ config PCH_GBE This MAC is present in Intel Platform Controller Hub EG20T. It supports 10/100/1000 Mbps operation. +config XILINX_AXIEMAC + depends on DM_ETH && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP) + select PHYLIB + select MII + bool "Xilinx AXI Ethernet" + help + This MAC is present in Xilinx Microblaze, Zynq and ZynqMP SoCs. + config ZYNQ_GEM depends on DM_ETH && (ARCH_ZYNQ || ARCH_ZYNQMP) select PHYLIB diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 4a514d08ae0f..81274ee13bca 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -17,10 +17,6 @@ DECLARE_GLOBAL_DATA_PTR; -#if !defined(CONFIG_PHYLIB) -# error AXI_ETHERNET requires PHYLIB -#endif - /* Link setup */ #define XAE_EMMC_LINKSPEED_MASK 0xC0000000 /* Link speed */ #define XAE_EMMC_LINKSPD_10 0x00000000 /* Link Speed mask for 10 Mbit */