From 0e6d798cb313580acd06ba01626687a557c5159f Mon Sep 17 00:00:00 2001 From: wdenk Date: Sun, 14 Mar 2004 00:07:33 +0000 Subject: * Patch by Travis Sawyer, 01 Mar 2004: Ocotea: - Add IBM PPC440GX Ref Platform support (Ocotea) Original code by Paul Reynolds Adapted to U-Boot and 440GX port 440gx_enet.c: - Add gracious handling of all Ethernet Pin Selections for 440GX - Add RGMII selection for Cicada CIS8201 Gigabit PHY ppc440.h: - Add needed bit definitions - Fix formatting * Patch by Carl Riechers, 1 Mar 2004: Add PPC440GX prbdv0 divider to fix memory clock calculation. * Patch by Stephan Linz, 27 Feb 2004 - avoid problems for targets without NFS download support --- net/rarp.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'net/rarp.c') diff --git a/net/rarp.c b/net/rarp.c index b8cc542c13..5f18d84834 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -51,13 +51,20 @@ RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3) #ifdef DEBUG printf("Got good RARP\n"); #endif - if (((s = getenv("autoload")) != NULL) && (*s == 'n')) { - NetState = NETLOOP_SUCCESS; - return; - } - else if ((s != NULL) && !strcmp(s, "NFS")) { - NfsStart(); - return; + 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 (CONFIG_COMMANDS & CFG_CMD_NFS) + } else if ((s != NULL) && !strcmp(s, "NFS")) { + NfsStart(); + return; +#endif + } } TftpStart (); } -- cgit v1.2.1