[PATCH] Clean up Katmai (440SPe) linker script

[u-boot] / common / cmd_net.c

diff --git a/common/cmd_net.c b/common/cmd_net.c
index 47f9622fad5e36254ddf31b1c49173b4cc0ecf69..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[])
 {
@@ -136,10 +136,23 @@ static void netboot_update_env (void)
 #endif
        if (NetOurNISDomain[0])
                setenv ("domain", NetOurNISDomain);
+
+#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;
@@ -279,4 +292,42 @@ U_BOOT_CMD(
 );
 #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 */