From patchwork Fri Feb 19 11:09:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Schmelzer X-Patchwork-Id: 585147 X-Patchwork-Delegate: trini@ti.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 87C0A1402A9 for ; Fri, 19 Feb 2016 22:10:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DBB8AA7669; Fri, 19 Feb 2016 12:10:07 +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 knNukXcsktPb; Fri, 19 Feb 2016 12:10:07 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 72639A7661; Fri, 19 Feb 2016 12:10:07 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B23EAA7657 for ; Fri, 19 Feb 2016 12:10:04 +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 cI24Lu_EvOf1 for ; Fri, 19 Feb 2016 12:10:04 +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.schmelzer.or.at (mail.schmelzer.or.at [87.106.47.214]) by theia.denx.de (Postfix) with ESMTP id 814B4A74DA for ; Fri, 19 Feb 2016 12:10:00 +0100 (CET) Received: from localhost (s15287728.onlinehome-server.info [127.0.0.1]) by hamspirit.at (Postfix) with ESMTP id 9060B1FC414C; Fri, 19 Feb 2016 11:10:00 +0000 (UTC) Received: from mail.schmelzer.or.at ([127.0.0.1]) by localhost (s15287728.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zOFR6ZNvDma0; Fri, 19 Feb 2016 11:09:55 +0000 (UTC) Received: from ategge3722.br-automation.co.at (212095007136.public.telering.at [212.95.7.136]) by hamspirit.at (Postfix) with ESMTP id 43F0D1FC4149; Fri, 19 Feb 2016 11:09:53 +0000 (UTC) From: Hannes Schmelzer To: u-boot@lists.denx.de Date: Fri, 19 Feb 2016 12:09:42 +0100 Message-Id: <1455880186-11585-1-git-send-email-oe5hpm@oevsv.at> X-Mailer: git-send-email 1.9.1 Cc: trini@konsulko.com, Hannes Schmelzer Subject: [U-Boot] [PATCH 1/5] board/BuR: drop ETH-support in SPL-Stage 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" During very early prototype-phase we did boot the AM335x boards initially from CPSW-EMAC. Now we don't need this feature anymore. So we drop it to save MLO-space and having therefore a more quickly boot. Signed-off-by: Hannes Schmelzer Reviewed-by: Tom Rini --- board/BuR/common/common.c | 9 ++------- include/configs/bur_am335x_common.h | 4 ---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 441465c..ce4acc1 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -640,8 +639,7 @@ static struct cpsw_platform_data cpsw_data = { }; #endif /* CONFIG_DRIVER_TI_CPSW, ... */ -#if defined(CONFIG_DRIVER_TI_CPSW) - +#if defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) int board_eth_init(bd_t *bis) { int rv = 0; @@ -658,8 +656,6 @@ int board_eth_init(bd_t *bis) mac_addr[4] = mac_lo & 0xFF; mac_addr[5] = (mac_lo & 0xFF00) >> 8; -#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ - (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) if (!getenv("ethaddr")) { #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_USE_FDT) printf(" not set. trying DTB ... "); @@ -685,10 +681,9 @@ int board_eth_init(bd_t *bis) printf("Error %d registering CPSW switch\n", rv); return 0; } -#endif /* CONFIG_DRIVER_TI_CPSW, ... */ return rv; } -#endif /* CONFIG_DRIVER_TI_CPSW */ +#endif /* defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD) */ #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) int board_mmc_init(bd_t *bis) { diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index ffc6811..e666933 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -62,12 +62,8 @@ #define CONFIG_CMD_PING #define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ #define CONFIG_MII /* Required in net/eth.c */ -#define CONFIG_SPL_ETH_SUPPORT #define CONFIG_PHYLIB #define CONFIG_PHY_NATSEMI -#define CONFIG_SPL_NET_SUPPORT -#define CONFIG_SPL_ENV_SUPPORT /* used for a fetching MAC-Address */ -#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" /* Network console */ #define CONFIG_NETCONSOLE 1 #define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */