From patchwork Tue Jan 12 06:41:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 566341 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 A1A8C140134 for ; Tue, 12 Jan 2016 17:40:04 +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=tnDXQg8N; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 60BCC4BEC5; Tue, 12 Jan 2016 07:39:31 +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 68UT7NwXTDgd; Tue, 12 Jan 2016 07:39:31 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6DCEE4BEF5; Tue, 12 Jan 2016 07:38:58 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 249194BEB4 for ; Tue, 12 Jan 2016 07:38:39 +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 gMkHdhWtLga1 for ; Tue, 12 Jan 2016 07:38:39 +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-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by theia.denx.de (Postfix) with ESMTPS id 27CA74BE9E for ; Tue, 12 Jan 2016 07:38:28 +0100 (CET) Received: by mail-pa0-f44.google.com with SMTP id yy13so241913742pab.3 for ; Mon, 11 Jan 2016 22:38:28 -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=XPASUG+zv3gkcn2YcY4CH2H9HfcXxr1/rW9gxyFASBg=; b=tnDXQg8N3jhZM1lxBJlPpI/nWlgfcY/3ZPq5BMgv9B1QwuGHSZOB0ODNgrCGc6AcF3 EtQmJ4h3v++oc/OGea31qaEyV+df3lxatxbGvaywfWl2dXZYR1NRdcCztT8TYmhHDZxn wpluO1OdyZ3UtN/u5aUhP2sWhZGeDGLyLBuC/Q7BDzyuTKgIY8rqxPvcyW1nQDXRu6jJ SMaq73ZPo/xiIEeY5tCZwOYNRSpYYhb6QMkWs3OYsciccUK2+FQnwcQgzLhRbAnPO6f6 0mLTQfKnA2EUu9AX9LNor5O1DoJ9RRVxZBY+4zw/HmOEQlV/AWntXH36+n8xPFt9h1FU ewOg== X-Received: by 10.66.160.100 with SMTP id xj4mr187106108pab.14.1452580706922; Mon, 11 Jan 2016 22:38:26 -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 f21sm27527281pfd.6.2016.01.11.22.38.26 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Jan 2016 22:38:26 -0800 (PST) From: Bin Meng To: Simon Glass , Joe Hershberger , U-Boot Mailing List , Alison Wang , York Sun Date: Mon, 11 Jan 2016 22:41:13 -0800 Message-Id: <1452580888-27637-3-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1452580888-27637-1-git-send-email-bmeng.cn@gmail.com> References: <1452580888-27637-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH 02/17] powerpc: c29xpcie: Do not wrap pci_eth_init() with CONFIG_TSEC_ENET 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" The call to pci_eth_init() should not be wrapped with CONFIG_TSEC_ENET. Signed-off-by: Bin Meng Acked-by: Joe Hershberger --- board/freescale/c29xpcie/c29xpcie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/c29xpcie/c29xpcie.c b/board/freescale/c29xpcie/c29xpcie.c index f42d373..e325b4d 100644 --- a/board/freescale/c29xpcie/c29xpcie.c +++ b/board/freescale/c29xpcie/c29xpcie.c @@ -83,9 +83,9 @@ void pci_init_board(void) } #endif /* ifdef CONFIG_PCI */ -#ifdef CONFIG_TSEC_ENET int board_eth_init(bd_t *bis) { +#ifdef CONFIG_TSEC_ENET struct fsl_pq_mdio_info mdio_info; struct tsec_info_struct tsec_info[2]; int num = 0; @@ -110,10 +110,10 @@ int board_eth_init(bd_t *bis) fsl_pq_mdio_init(bis, &mdio_info); tsec_eth_init(bis, tsec_info, num); +#endif return pci_eth_init(bis); } -#endif #if defined(CONFIG_OF_BOARD_SETUP) void fdt_del_sec(void *blob, int offset)