From: Joe Hershberger <joe.hershberger@ni.com>
Date: Wed, 20 May 2015 19:27:25 +0000 (-0500)
Subject: net: Remove duplicate bootfile syncing functionality
X-Git-Tag: v2015.07-rc2~115
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d1febf7d5867cb5441c5d5081d042b61cc647eb;p=oweals%2Fu-boot.git

net: Remove duplicate bootfile syncing functionality

The bootfile env var is already kept up to date by the callback in net.c
so there is no need to poll it too.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
---

diff --git a/net/eth.c b/net/eth.c
index 6c49db583b..a40abb5f94 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -60,16 +60,6 @@ static inline int eth_setenv_enetaddr_by_index(const char *base_name, int index,
 	return eth_setenv_enetaddr(enetvar, enetaddr);
 }
 
-static void eth_env_init(void)
-{
-	const char *s;
-
-	s = getenv("bootfile");
-	if (s != NULL)
-		copy_filename(net_boot_file_name, s,
-			      sizeof(net_boot_file_name));
-}
-
 static int eth_mac_skip(int index)
 {
 	char enetvar[15];
@@ -104,8 +94,6 @@ static void eth_common_init(void)
 	phy_init();
 #endif
 
-	eth_env_init();
-
 	/*
 	 * If board-specific initialization exists, call it.
 	 * If not, call a CPU-specific one