From e4a3d57dc79e8c94e3272c4a82b146df0fe3dda6 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 27 Oct 2011 06:24:32 +0000 Subject: net: Export auto_load, use it in rarp The rarp code includes another instance of the auto_load logic, so call what is now net_auto_load() instead. This also fixes an incorrect call to TftpStart() which was never seen since apparently no boards enable rarp. Signed-off-by: Simon Glass Acked-by: Mike Frysinger --- net/rarp.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'net/rarp.c') diff --git a/net/rarp.c b/net/rarp.c index 94c86d3429..097f970f44 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -46,24 +46,8 @@ static void RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2, unsigned dummi3) { - char *s; debug("Got good RARP\n"); - if ((s = getenv("autoload")) != NULL) { - if (*s == 'n') { - /* - * Just use RARP to configure system; - * Do not use TFTP/NFS to to load the bootfile. - */ - NetState = NETLOOP_SUCCESS; - return; -#if defined(CONFIG_CMD_NFS) - } else if ((s != NULL) && !strcmp(s, "NFS")) { - NfsStart(); - return; -#endif - } - } - TftpStart (); + net_auto_load(); } -- cgit v1.2.1