From patchwork Mon Nov 16 09:19:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 544943 X-Patchwork-Delegate: joe.hershberger@gmail.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 9FFC31402B3 for ; Mon, 16 Nov 2015 20:16:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Swi9Sy14; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3BDFF4B691; Mon, 16 Nov 2015 10:16:55 +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 qughMLYOxwJE; Mon, 16 Nov 2015 10:16:54 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 850A84B65A; Mon, 16 Nov 2015 10:16:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DF3A44B688 for ; Mon, 16 Nov 2015 10:16:40 +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 7TUjjW7kyzgb for ; Mon, 16 Nov 2015 10:16:40 +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 mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by theia.denx.de (Postfix) with ESMTPS id 5661F4B65A for ; Mon, 16 Nov 2015 10:16:32 +0100 (CET) Received: by pacej9 with SMTP id ej9so62761700pac.2 for ; Mon, 16 Nov 2015 01:16:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=mvTUumALR/5xOwO10X6rOxolPp74+wkFwGD0TfX7Xy0=; b=Swi9Sy14aCnPYBQGCHY70DlOiMA59by3ovygaNwWqasgVfC2bL+TP9iGI7FkwIFLNi S/4nnAqeIYQs0K1NUvNioyuFNj/1P3z1VboJ2u36nrXYp88TYJaqxq7HZwBk/4ndoMSB FUl9o3FCMkEhS0QYfGyGC6xNJOXqDf3CwJWpOnw6dSlbQI+GrbVIMUV0gmqql5EM4UXk AlhxOF0r008l0AB5T+feQ+82dfc0xAOCIcHXJg4OuSBw6N1KUGkPmYYBOK6mat8k0yeG 3/x/sGu19KBhU4P2/kyXLvFxt+GLC8gU8PtkHpQT7RQuLR79o81OdpZmLn313YBN9GqT aTfQ== X-Received: by 10.66.157.65 with SMTP id wk1mr14474779pab.138.1447665391476; Mon, 16 Nov 2015 01:16:31 -0800 (PST) Received: from ala-d2121-lx1.wrs.com (unknown-157-139.windriver.com. [147.11.157.139]) by smtp.gmail.com with ESMTPSA id of1sm35141769pbc.11.2015.11.16.01.16.30 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Nov 2015 01:16:30 -0800 (PST) From: Bin Meng To: Joe Hershberger , U-Boot Mailing List Date: Mon, 16 Nov 2015 01:19:17 -0800 Message-Id: <1447665558-21632-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1447665558-21632-1-git-send-email-bmeng.cn@gmail.com> References: <1447665558-21632-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 2/3] net: e1000: Remove CONFIG_MVBC_1G 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" CONFIG_MVBC_1G is not referenced anywhere, hence remove it. Signed-off-by: Bin Meng Acked-by: Joe Hershberger --- drivers/net/e1000.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 508ebfb..6be2d9f 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -5286,7 +5286,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno, #ifndef CONFIG_E1000_NO_NVM /* Validate the EEPROM and get chipset information */ -#if !defined(CONFIG_MVBC_1G) if (e1000_init_eeprom_params(hw)) { E1000_ERR(hw, "EEPROM is invalid!\n"); return -EINVAL; @@ -5294,7 +5293,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno, if ((E1000_READ_REG(hw, I210_EECD) & E1000_EECD_FLUPD) && e1000_validate_eeprom_checksum(hw)) return -ENXIO; -#endif e1000_read_mac_addr(hw, enetaddr); #endif e1000_get_bus_type(hw);