Merge with /home/m8/git/u-boot

[u-boot] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 85a90237342796f7e835e06a73771620cec1b655..2cb2c5d34be60fac07d42da07cd8eb9e49e56cfe 100644 (file)
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -33,7 +33,7 @@
 
 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 
-static int netboot_common (int, cmd_tbl_t *, int , char *[]);
+static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]);
 
 int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -42,7 +42,7 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        bootp,  3,      1,      do_bootp,
-       "bootp   - boot image via network using BootP/TFTP protocol\n",
+       "bootp\t- boot image via network using BootP/TFTP protocol\n",
        "[loadAddress] [bootfilename]\n"
 );
 
@@ -76,7 +76,7 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        dhcp,   3,      1,      do_dhcp,
-       "dhcp    - invoke DHCP client to obtain IP/boot params\n",
+       "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
        "\n"
 );
 #endif /* CFG_CMD_DHCP */
@@ -89,69 +89,70 @@ int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        nfs,    3,      1,      do_nfs,
-       "nfs    - boot image via network using NFS protocol\n",
+       "nfs\t- boot image via network using NFS protocol\n",
        "[loadAddress] [host ip addr:bootfilename]\n"
 );
 #endif /* CFG_CMD_NFS */
 
-static void netboot_update_env(void)
+static void netboot_update_env (void)
 {
-    char tmp[22] ;
+       char tmp[22];
 
-    if (NetOurGatewayIP) {
-       ip_to_string (NetOurGatewayIP, tmp);
-       setenv("gatewayip", tmp);
-    }
-
-    if (NetOurSubnetMask) {
-       ip_to_string (NetOurSubnetMask, tmp);
-       setenv("netmask", tmp);
-    }
+       if (NetOurGatewayIP) {
+               ip_to_string (NetOurGatewayIP, tmp);
+               setenv ("gatewayip", tmp);
+       }
 
-    if (NetOurHostName[0])
-       setenv("hostname", NetOurHostName);
+       if (NetOurSubnetMask) {
+               ip_to_string (NetOurSubnetMask, tmp);
+               setenv ("netmask", tmp);
+       }
 
-    if (NetOurRootPath[0])
-       setenv("rootpath", NetOurRootPath);
+       if (NetOurHostName[0])
+               setenv ("hostname", NetOurHostName);
 
-    if (NetOurIP) {
-       ip_to_string (NetOurIP, tmp);
-       setenv("ipaddr", tmp);
-    }
+       if (NetOurRootPath[0])
+               setenv ("rootpath", NetOurRootPath);
 
-    if (NetServerIP) {
-       ip_to_string (NetServerIP, tmp);
-       setenv("serverip", tmp);
-    }
+       if (NetOurIP) {
+               ip_to_string (NetOurIP, tmp);
+               setenv ("ipaddr", tmp);
+       }
 
-    if (NetOurDNSIP) {
-       ip_to_string (NetOurDNSIP, tmp);
-       setenv("dnsip", tmp);
-    }
+       if (NetServerIP) {
+               ip_to_string (NetServerIP, tmp);
+               setenv ("serverip", tmp);
+       }
 
+       if (NetOurDNSIP) {
+               ip_to_string (NetOurDNSIP, tmp);
+               setenv ("dnsip", tmp);
+       }
 #if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
-    if (NetOurDNS2IP) {
-           ip_to_string (NetOurDNS2IP, tmp);
-           setenv("dnsip2", tmp);
-    }
+       if (NetOurDNS2IP) {
+               ip_to_string (NetOurDNS2IP, tmp);
+               setenv ("dnsip2", tmp);
+       }
 #endif
+       if (NetOurNISDomain[0])
+               setenv ("domain", NetOurNISDomain);
 
-    if (NetOurNISDomain[0])
-       setenv("domain", NetOurNISDomain);
-
-    if (ntohs(NetOurVLAN) != (ushort)-1) {
-           VLAN_to_string(NetOurVLAN, tmp);
-           setenv("vlan", tmp);
-    }
-
-    if (ntohs(NetOurNativeVLAN) != (ushort)-1) {
-           VLAN_to_string(NetOurNativeVLAN, tmp);
-           setenv("vlan", tmp);
-    }
-
+#if (CONFIG_COMMANDS & CFG_CMD_SNTP) && (CONFIG_BOOTP_MASK & 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 (NetNtpServerIP) {
+               ip_to_string (NetNtpServerIP, tmp);
+               setenv ("ntpserverip", tmp);
+       }
+#endif
 }
+
 static int
-netboot_common (int proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
+netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char *argv[])
 {
        char *s;
        int   rcode = 0;
@@ -243,7 +244,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        ping,   2,      1,      do_ping,
-       "ping    - send ICMP ECHO_REQUEST to network host\n",
+       "ping\t- send ICMP ECHO_REQUEST to network host\n",
        "pingAddress\n"
 );
 #endif /* CFG_CMD_PING */
@@ -287,8 +288,46 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        cdp,    1,      1,      do_cdp,
-       "cdp     - Perform CDP network configuration\n",
+       "cdp\t- Perform CDP network configuration\n",
 );
 #endif /* CFG_CMD_CDP */
 
+#if (CONFIG_COMMANDS & CFG_CMD_SNTP)
+int do_sntp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+       char *toff;
+
+       if (argc < 2) {
+               NetNtpServerIP = getenv_IPaddr ("ntpserverip");
+               if (NetNtpServerIP == 0) {
+                       printf ("ntpserverip not set\n");
+                       return (1);
+               }
+       } else {
+               NetNtpServerIP = string_to_ip(argv[1]);
+               if (NetNtpServerIP == 0) {
+                       printf ("Bad NTP server IP address\n");
+                       return (1);
+               }
+       }
+
+       toff = getenv ("timeoffset");
+       if (toff == NULL) NetTimeOffset = 0;
+       else NetTimeOffset = simple_strtol (toff, NULL, 10);
+
+       if (NetLoop(SNTP) < 0) {
+               printf("SNTP failed: host %s not responding\n", argv[1]);
+               return 1;
+       }
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       sntp,   2,      1,      do_sntp,
+       "sntp\t- synchronize RTC via network\n",
+       "[NTP server IP]\n"
+);
+#endif /* CFG_CMD_SNTP */
+
 #endif /* CFG_CMD_NET */