From patchwork Tue Oct 23 02:40:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 193312 X-Patchwork-Delegate: sbabic@denx.de 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 4EBAE2C0172 for ; Tue, 23 Oct 2012 13:41:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AEF5C4A25A; Tue, 23 Oct 2012 04:41:09 +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 L4y36CquBasD; Tue, 23 Oct 2012 04:41:09 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3BA4C4A21F; Tue, 23 Oct 2012 04:41:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1AF9D4A21C for ; Tue, 23 Oct 2012 04:41:01 +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 eI4Cu4DWdXWT for ; Tue, 23 Oct 2012 04:40:59 +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 mail-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id 6669A4A21F for ; Tue, 23 Oct 2012 04:40:54 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id ro8so84644pbb.3 for ; Mon, 22 Oct 2012 19:40:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=DNlW4AE8aqkTf+K/AfgvzHUMEJ75ehnt90lAJ+QjVHc=; b=VPBOybETxn6R6ndIBn1U1+/DP5INus6R2PFfOxwNyW/GhrBPKs4XEN9SJsOwkVzmFX hadfs7/fHpj2KXdKDzOAzXuxSlnhp5GJaOjwD7Pd43PYfVtn3CGww0B2p/FntlO1Z7TD 7EYFF+bqxSE0j0tIU5fMEhZ9qpKiiwqJntRZNY0fRjViTCSMI+uz+nrEVGTx831i+BMd bcKHBgmBrt5e8piX1y+ZJwvEvrlgyVi0foEmz/fnkyfNk5jACIg59HK1ws1A5LbLnDc6 LBAhfxgCKGmyT4qD+SjVQXtdCBBRhmHrIvCYhN992roztuv44k9ts6sRA1UiG2mdgVkU ecCA== Received: by 10.68.197.197 with SMTP id iw5mr35438638pbc.22.1350960052730; Mon, 22 Oct 2012 19:40:52 -0700 (PDT) Received: from officeserver-2 ([70.96.116.236]) by mx.google.com with ESMTPS id qd9sm6879020pbb.31.2012.10.22.19.40.49 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 19:40:51 -0700 (PDT) Received: from tkisky by officeserver-2 with local (Exim 4.76) (envelope-from ) id 1TQUQi-00066L-S4; Mon, 22 Oct 2012 19:41:20 -0700 From: Troy Kisky To: u-boot@lists.denx.de, Joe Hershberger , sbabic@denx.de, dirk.behme@googlemail.com Date: Mon, 22 Oct 2012 19:40:40 -0700 Message-Id: <1350960047-23404-3-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350960047-23404-1-git-send-email-troy.kisky@boundarydevices.com> References: <1345502918-18305-1-git-send-email-troy.kisky@boundarydevices.com> <1350960047-23404-1-git-send-email-troy.kisky@boundarydevices.com> X-Gm-Message-State: ALoCoQkDAi1qjmQ3kLlFhxhOahSSMC0LKAxSx83NaH+jgLw9bCU5cU4jAvb/7S2+Nv98KLJlnhxH Cc: afleming@gmail.com Subject: [U-Boot] [PATCH V3 2/9] net: fec_mxc: delete CONFIG_FEC_MXC_MULTI 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de It is more logical to test for CONFIG_FEC_MXC_PHYADDR to determine whether to define the function fecmxc_initialize. Signed-off-by: Troy Kisky --- drivers/net/fec_mxc.c | 2 +- include/configs/m28evk.h | 1 - include/configs/mx28evk.h | 1 - include/configs/sc_sps_1.h | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 3e232c7..6596ceb 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1021,7 +1021,7 @@ err1: return ret; } -#ifndef CONFIG_FEC_MXC_MULTI +#ifdef CONFIG_FEC_MXC_PHYADDR int fecmxc_initialize(bd_t *bd) { int lout = 1; diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index bdbb820..2e8a236 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -189,7 +189,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_ETHPRIME "FEC0" #define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_MULTI #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RMII #endif diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 7cdbec6..8178aa8 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -163,7 +163,6 @@ #define CONFIG_NET_MULTI #define CONFIG_ETHPRIME "FEC0" #define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_MULTI #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_MX28_FEC_MAC_IN_OCOTP diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index f5dc393..4177e3d 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -158,7 +158,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_ETHPRIME "FEC0" #define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_MULTI #define CONFIG_MII #define CONFIG_DISCOVER_PHY #define CONFIG_FEC_XCV_TYPE RMII