diff mbox

[U-Boot,v5,12/26] net: Remove duplicate bootfile syncing functionality

Message ID 1432150059-24238-13-git-send-email-joe.hershberger@ni.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Joe Hershberger May 20, 2015, 7:27 p.m. UTC 
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>
---

Changes in v5: None
Changes in v4: None
Changes in v3:
-New for version 3

Changes in v2: None

 net/eth.c | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Tom Rini May 23, 2015, 12:40 p.m. UTC | #1 
On Wed, May 20, 2015 at 02:27:25PM -0500, Joe Hershberger wrote:

> 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>

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

Patch

diff --git a/net/eth.c b/net/eth.c
index 8e6acfe..3c30232 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