From patchwork Mon Oct 17 14:46:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 120220 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 A98BAB6F94 for ; Tue, 18 Oct 2011 01:46:36 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CF62428720; Mon, 17 Oct 2011 16:46:33 +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 LM+h5-ZGDaP0; Mon, 17 Oct 2011 16:46:33 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 29D6A2868C; Mon, 17 Oct 2011 16:46:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 26AC92868C for ; Mon, 17 Oct 2011 16:46:29 +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 vcw0f2K0VIkH for ; Mon, 17 Oct 2011 16:46:27 +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 smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by theia.denx.de (Postfix) with ESMTPS id 6B5E72861D for ; Mon, 17 Oct 2011 16:46:24 +0200 (CEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id DF2E71B402A for ; Mon, 17 Oct 2011 14:46:20 +0000 (UTC) From: Mike Frysinger To: u-boot@lists.denx.de Date: Mon, 17 Oct 2011 10:46:20 -0400 Message-Id: <1318862780-2917-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <20111017105724.2100A140797D@gemini.denx.de> References: <20111017105724.2100A140797D@gemini.denx.de> Subject: [U-Boot] [PATCH] powerpc: net: restore fcc addr logic X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 In the recent dropping of !NET_MULTI code (commit e2a53458a7ab37523304), I misread the logic in include/net.h. Some of it was used by NET_MULTI code. So restore it to fix failing boards, and do so in the powerpc asm config header (which is a better place anyways). Signed-off-by: Mike Frysinger --- note: haven't finished MAKEALL, but this should fix things I think arch/powerpc/include/asm/config.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index d138636..f572e06 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -36,6 +36,25 @@ # endif #endif +#if defined(CONFIG_CPM2) && defined(CONFIG_ETHER_ON_FCC) +# if defined(CONFIG_ETHER_ON_SCC) +# error "Ethernet not correctly defined" +# endif /* CONFIG_ETHER_ON_SCC */ +# if (CONFIG_ETHER_INDEX == 1) +# define CONFIG_ETHER_ON_FCC1 +# define CONFIG_SYS_CMXFCR_MASK1 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE1 CONFIG_SYS_CMXFCR_VALUE +# elif (CONFIG_ETHER_INDEX == 2) +# define CONFIG_ETHER_ON_FCC2 +# define CONFIG_SYS_CMXFCR_MASK2 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE2 CONFIG_SYS_CMXFCR_VALUE +# elif (CONFIG_ETHER_INDEX == 3) +# define CONFIG_ETHER_ON_FCC3 +# define CONFIG_SYS_CMXFCR_MASK3 CONFIG_SYS_CMXFCR_MASK +# define CONFIG_SYS_CMXFCR_VALUE3 CONFIG_SYS_CMXFCR_VALUE +# endif /* CONFIG_ETHER_INDEX */ +#endif /* CONFIG_8260 && CONFIG_ETHER_ON_FCC */ + #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_SYS_BOOT_GET_CMDLINE