diff mbox

[U-Boot,1/5] board/BuR: drop ETH-support in SPL-Stage

Message ID 1455880186-11585-1-git-send-email-oe5hpm@oevsv.at
State Accepted
Commit 568cfb4d7baa711aa2571bb9076f7b3263e86b9a
Delegated to: Tom Rini
Headers show

Commit Message

Hannes Schmelzer Feb. 19, 2016, 11:09 a.m. UTC 
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 <oe5hpm@oevsv.at>
---

 board/BuR/common/common.c           | 9 ++-------
 include/configs/bur_am335x_common.h | 4 ----
 2 files changed, 2 insertions(+), 11 deletions(-)

Comments

Tom Rini Feb. 20, 2016, 12:55 a.m. UTC | #1 
On Fri, Feb 19, 2016 at 12:09:42PM +0100, Hannes Schmelzer wrote:

> 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 <oe5hpm@oevsv.at>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini Feb. 25, 2016, 3:24 p.m. UTC | #2 
On Fri, Feb 19, 2016 at 12:09:42PM +0100, Hannes Schmelzer wrote:

> 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 <oe5hpm@oevsv.at>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

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 <version.h>
 #include <common.h>
 #include <errno.h>
-#include <spl.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/omap.h>
@@ -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("<ethaddr> 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 */