leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/: Remove lingering references to CFG_CMD_* symbols.

Browse Source 
Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-10 11:05:02 -05:00
parent 9025317883
commit 610f2e9c28
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/bootp.c
View File

@ -81,7 +81,7 @@ extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e after add own opts. */
extern u8 *dhcp_vendorex_proc (u8 *e); /*rtn next e if mine,else NULL */
#endif
#endif /* CFG_CMD_DHCP */
#endif
static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
{
@ -357,7 +357,7 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
TftpStart();
}
#endif /* !CFG_CMD_DHCP */
#endif
/*
* Timeout on BOOTP/DHCP request.
@ -491,7 +491,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
return e - start;
}
#else /* CFG_CMD_DHCP */
#else
/*
* Warning: no field size check - change CONFIG_BOOTP_* at your own risk!
*/
@ -513,7 +513,7 @@ static int BootpExtended (u8 * e)
*e++ = 2;
*e++ = (576 - 312 + OPT_SIZE) >> 16;
*e++ = (576 - 312 + OPT_SIZE) & 0xff;
#endif /* CFG_CMD_DHCP */
#endif
#if defined(CONFIG_BOOTP_SUBNETMASK)
*e++ = 1; /* Subnet mask request */
@ -561,7 +561,7 @@ static int BootpExtended (u8 * e)
return e - start;
}
#endif /* CFG_CMD_DHCP */
#endif
void
BootpRequest (void)
@ -682,7 +682,7 @@ BootpRequest (void)
ext_len = DhcpExtended((u8 *)bp->bp_vend, DHCP_DISCOVER, 0, 0);
#else
ext_len = BootpExtended((u8 *)bp->bp_vend);
#endif /* CFG_CMD_DHCP */
#endif
/*
* Bootp ID is the lower 4 bytes of our ethernet address
@ -710,7 +710,7 @@ BootpRequest (void)
NetSetHandler(DhcpHandler);
#else
NetSetHandler(BootpHandler);
#endif /* CFG_CMD_DHCP */
#endif
NetSendPacket(NetTxPacket, pktlen);
}
@ -975,6 +975,6 @@ void DhcpRequest(void)
{
BootpRequest();
}
#endif /* CFG_CMD_DHCP */
#endif
#endif /* CFG_CMD_NET */
#endif

8
net/net.c
View File

@ -414,7 +414,7 @@ restart:
NetServerIP = getenv_IPaddr ("serverip");
DhcpRequest(); /* Basically same as BOOTP */
break;
#endif /* CFG_CMD_DHCP */
#endif
case BOOTP:
BootpTry = 0;
@ -775,7 +775,7 @@ static void PingStart(void)
PingSend();
}
#endif /* CFG_CMD_PING */
#endif
#if defined(CONFIG_CMD_CDP)
@ -1128,7 +1128,7 @@ static void CDPStart(void)
CDPSendTrigger();
}
#endif /* CFG_CMD_CDP */
#endif
void
@ -1693,7 +1693,7 @@ void copy_filename (char *dst, char *src, int size)
*dst = '\0';
}
#endif /* CFG_CMD_NET */
#endif
void ip_to_string (IPaddr_t x, char *s)
{

2
net/rarp.c
View File

@ -119,4 +119,4 @@ RarpRequest (void)
NetSetHandler(RarpHandler);
}
#endif /* CFG_CMD_NET */
#endif

2
net/tftp.c
View File

@ -386,4 +386,4 @@ TftpStart (void)
TftpSend ();
}
#endif /* CFG_CMD_NET */
#endif