X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=net%2Fsntp.c;h=9c8ee34a4ed7838ced1fa01eda84dcc1b9735bcf;hb=1e72a757bb32e3ccc4fe5d23baaa6d19b3760a1e;hp=d3427d880b6acdc03cf4439a6301c7eda6e4f0fe;hpb=bc0571fc1067ff8a8fd16990ae65c1a2826ea90c;p=oweals%2Fu-boot.git

diff --git a/net/sntp.c b/net/sntp.c
index d3427d880b..9c8ee34a4e 100644
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <dm.h>
 #include <net.h>
 #include <rtc.h>
 
@@ -50,28 +51,43 @@ static void sntp_timeout_handler(void)
 static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 			 unsigned src, unsigned len)
 {
+#ifdef CONFIG_TIMESTAMP
 	struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
 	struct rtc_time tm;
 	ulong seconds;
+#endif
 
 	debug("%s\n", __func__);
 
 	if (dest != sntp_our_port)
 		return;
 
+#ifdef CONFIG_TIMESTAMP
 	/*
-	 * As the RTC's used in U-Boot sepport second resolution only
+	 * As the RTC's used in U-Boot support second resolution only
 	 * we simply ignore the sub-second field.
 	 */
 	memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
 
-	to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm);
+	rtc_to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm);
 #if defined(CONFIG_CMD_DATE)
+#  ifdef CONFIG_DM_RTC
+	struct udevice *dev;
+	int ret;
+
+	ret = uclass_get_device(UCLASS_RTC, 0, &dev);
+	if (ret)
+		printf("SNTP: cannot find RTC: err=%d\n", ret);
+	else
+		dm_rtc_set(dev, &tm);
+#  else
 	rtc_set(&tm);
+#  endif
 #endif
 	printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
 	       tm.tm_year, tm.tm_mon, tm.tm_mday,
 	       tm.tm_hour, tm.tm_min, tm.tm_sec);
+#endif
 
 	net_set_state(NETLOOP_SUCCESS);
 }