Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-09 03:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'testing' into working

Browse source 
Conflicts:

	CHANGELOG
	fs/fat/fat.c
	include/configs/MPC8560ADS.h
	include/configs/pcs440ep.h
	net/eth.c
This commit is contained in:
Andy Fleming 2007-08-03 02:23:23 -05:00 • committed by Andrew Fleming-AFLEMING
commit 6bf6f114dc
790 changed files with 11070 additions and 15256 deletions
Download patch file Download diff file Expand all files Collapse all files

32
common/cmd_net.c
View file

@ -28,7 +28,7 @@
#include <command.h>
#include <net.h>
#if (CONFIG_COMMANDS & CFG_CMD_NET)
#if defined(CONFIG_CMD_NET)
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h>
@ -75,7 +75,7 @@ U_BOOT_CMD(
"[loadAddress] [bootfilename]\n"
);
#if (CONFIG_COMMANDS & CFG_CMD_DHCP)
#if defined(CONFIG_CMD_DHCP)
int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common(DHCP, cmdtp, argc, argv);
@ -86,9 +86,9 @@ U_BOOT_CMD(
"dhcp\t- invoke DHCP client to obtain IP/boot params\n",
"\n"
);
#endif /* CFG_CMD_DHCP */
#endif
#if (CONFIG_COMMANDS & CFG_CMD_NFS)
#if defined(CONFIG_CMD_NFS)
int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common(NFS, cmdtp, argc, argv);
@ -99,7 +99,7 @@ U_BOOT_CMD(
"nfs\t- boot image via network using NFS protocol\n",
"[loadAddress] [host ip addr:bootfilename]\n"
);
#endif /* CFG_CMD_NFS */
#endif
static void netboot_update_env (void)
{
@ -135,7 +135,7 @@ static void netboot_update_env (void)
ip_to_string (NetOurDNSIP, tmp);
setenv ("dnsip", tmp);
}
#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
#if defined(CONFIG_BOOTP_DNS2)
if (NetOurDNS2IP) {
ip_to_string (NetOurDNS2IP, tmp);
setenv ("dnsip2", tmp);
@ -144,13 +144,15 @@ static void netboot_update_env (void)
if (NetOurNISDomain[0])
setenv ("domain", NetOurNISDomain);
#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
#if defined(CONFIG_CMD_SNTP) \
&& defined(CONFIG_BOOTP_TIMEOFFSET)
if (NetTimeOffset) {
sprintf (tmp, "%d", NetTimeOffset);
setenv ("timeoffset", tmp);
}
#endif
#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
#if defined(CONFIG_CMD_SNTP) \
&& defined(CONFIG_BOOTP_NTPSERVER)
if (NetNtpServerIP) {
ip_to_string (NetNtpServerIP, tmp);
setenv ("ntpserverip", tmp);
@ -242,7 +244,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
return rcode;
}
#if (CONFIG_COMMANDS & CFG_CMD_PING)
#if defined(CONFIG_CMD_PING)
int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
if (argc < 2)
@ -269,9 +271,9 @@ U_BOOT_CMD(
"ping\t- send ICMP ECHO_REQUEST to network host\n",
"pingAddress\n"
);
#endif /* CFG_CMD_PING */
#endif
#if (CONFIG_COMMANDS & CFG_CMD_CDP)
#if defined(CONFIG_CMD_CDP)
static void cdp_update_env(void)
{
@ -312,9 +314,9 @@ U_BOOT_CMD(
cdp, 1, 1, do_cdp,
"cdp\t- Perform CDP network configuration\n",
);
#endif /* CFG_CMD_CDP */
#endif
#if (CONFIG_COMMANDS & CFG_CMD_SNTP)
#if defined(CONFIG_CMD_SNTP)
int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
char *toff;
@ -350,6 +352,6 @@ U_BOOT_CMD(
"sntp\t- synchronize RTC via network\n",
"[NTP server IP]\n"
);
#endif /* CFG_CMD_SNTP */
#endif
#endif /* CFG_CMD_NET */
#endif