* Patch by Masami Komiya, 30 Mar 2005:
  add SNTP support and expand time server and time offset fields of
  DHCP support. See doc/README.SNTP

* Patch by Steven Scholz, 13 Dec 2004:
  Fix bug in at91rm920 ethernet driver
diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h
index 600a631..7d62685 100644
--- a/include/cmd_confdefs.h
+++ b/include/cmd_confdefs.h
@@ -92,6 +92,7 @@
 #define CFG_CMD_XIMG	0x0400000000000000ULL	/* Load part of Multi Image	*/
 #define CFG_CMD_UNIVERSE 0x0800000000000000ULL	/* Tundra Universe Support      */
 #define CFG_CMD_EXT2    0x1000000000000000ULL	/* EXT2 Support                 */
+#define CFG_CMD_SNTP	0x2000000000000000ULL	/* SNTP support			*/
 
 #define CFG_CMD_ALL	0xFFFFFFFFFFFFFFFFULL	/* ALL commands			*/
 
@@ -135,6 +136,7 @@
 			CFG_CMD_SAVES	| \
 			CFG_CMD_SCSI	| \
 			CFG_CMD_SDRAM	| \
+			CFG_CMD_SNTP	| \
 			CFG_CMD_SPI	| \
 			CFG_CMD_UNIVERSE | \
 			CFG_CMD_USB	| \
@@ -162,6 +164,8 @@
 #define CONFIG_BOOTP_DNS		0x00000040
 #define CONFIG_BOOTP_DNS2		0x00000080
 #define CONFIG_BOOTP_SEND_HOSTNAME	0x00000100
+#define CONFIG_BOOTP_NTPSERVER		0x00000200
+#define CONFIG_BOOTP_TIMEOFFSET		0x00000400
 
 #define CONFIG_BOOTP_VENDOREX		0x80000000
 
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index bc0f7c7..fece9d1 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -92,10 +92,11 @@
 
 #define CONFIG_COMMANDS	      ( CONFIG_CMD_DFL	| \
 				CFG_CMD_ASKENV	| \
+				CFG_CMD_DATE	| \
 				CFG_CMD_DHCP	| \
 				CFG_CMD_ELF	| \
 				CFG_CMD_IDE	| \
-				CFG_CMD_DATE	)
+				CFG_CMD_SNTP	)
 
 #define CONFIG_NETCONSOLE
 
diff --git a/include/net.h b/include/net.h
index 9e55430..e50c381 100644
--- a/include/net.h
+++ b/include/net.h
@@ -335,7 +335,7 @@
 extern int		NetRestartWrap;		/* Tried all network devices	*/
 #endif
 
-typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS } proto_t;
+typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP } proto_t;
 
 /* from net/net.c */
 extern char	BootFile[128];			/* Boot File name		*/
@@ -350,6 +350,11 @@
 extern ushort CDPApplianceVLAN;
 #endif
 
+#if (CONFIG_COMMANDS & CFG_CMD_SNTP)
+extern IPaddr_t	NetNtpServerIP;			/* the ip address to NTP 	*/
+extern int NetTimeOffset;			/* offset time from UTC		*/
+#endif
+
 /* Initialize the network adapter */
 extern int	NetLoop(proto_t);