projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'testing' into working
[platform/kernel/u-boot.git]
/
common
/
cmd_net.c
diff --git
a/common/cmd_net.c
b/common/cmd_net.c
index
e9d552e
..
fa4f968
100644
(file)
--- a/
common/cmd_net.c
+++ b/
common/cmd_net.c
@@
-28,7
+28,7
@@
#include <command.h>
#include <net.h>
#include <command.h>
#include <net.h>
-#if
(CONFIG_COMMANDS & CF
G_CMD_NET)
+#if
defined(CONFI
G_CMD_NET)
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h>
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# include <status_led.h>
@@
-75,7
+75,7
@@
U_BOOT_CMD(
"[loadAddress] [bootfilename]\n"
);
"[loadAddress] [bootfilename]\n"
);
-#if
(CONFIG_COMMANDS & CF
G_CMD_DHCP)
+#if
defined(CONFI
G_CMD_DHCP)
int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common(DHCP, cmdtp, argc, argv);
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"
);
"dhcp\t- invoke DHCP client to obtain IP/boot params\n",
"\n"
);
-#endif
/* CFG_CMD_DHCP */
+#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_NFS)
+#if
defined(CONFI
G_CMD_NFS)
int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
return netboot_common(NFS, cmdtp, argc, argv);
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"
);
"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)
{
static void netboot_update_env (void)
{
@@
-135,7
+135,7
@@
static void netboot_update_env (void)
ip_to_string (NetOurDNSIP, tmp);
setenv ("dnsip", tmp);
}
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);
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 (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 (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);
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;
}
return rcode;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_PING)
+#if
defined(CONFI
G_CMD_PING)
int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
if (argc < 2)
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"
);
"ping\t- send ICMP ECHO_REQUEST to network host\n",
"pingAddress\n"
);
-#endif
/* CFG_CMD_PING */
+#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_CDP)
+#if
defined(CONFI
G_CMD_CDP)
static void cdp_update_env(void)
{
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",
);
cdp, 1, 1, do_cdp,
"cdp\t- Perform CDP network configuration\n",
);
-#endif
/* CFG_CMD_CDP */
+#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_SNTP)
+#if
defined(CONFI
G_CMD_SNTP)
int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
char *toff;
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"
);
"sntp\t- synchronize RTC via network\n",
"[NTP server IP]\n"
);
-#endif
/* CFG_CMD_SNTP */
+#endif
-#endif
/* CFG_CMD_NET */
+#endif