| Message ID | 1428475285-25836-25-git-send-email-joe.hershberger@ni.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On 8 April 2015 at 00:41, Joe Hershberger <joe.hershberger@ni.com> wrote: > When SNTP is enabled and DATE is not, to_tm() is not built in. It could > be defined when TIMESTAMP is defined, so check for that. > > Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> > --- > > Changes in v2: > -New to series > > net/sntp.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Acked-by: Simon Glass <sjg@chromium.org>
On 8 April 2015 at 06:47, Simon Glass <sjg@chromium.org> wrote: > On 8 April 2015 at 00:41, Joe Hershberger <joe.hershberger@ni.com> wrote: >> When SNTP is enabled and DATE is not, to_tm() is not built in. It could >> be defined when TIMESTAMP is defined, so check for that. >> >> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> >> --- >> >> Changes in v2: >> -New to series >> >> net/sntp.c | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm/next, thanks!
diff --git a/net/sntp.c b/net/sntp.c index d3427d8..6422eef 100644 --- a/net/sntp.c +++ b/net/sntp.c @@ -50,17 +50,20 @@ 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)); @@ -72,6 +75,7 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, 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); }
When SNTP is enabled and DATE is not, to_tm() is not built in. It could be defined when TIMESTAMP is defined, so check for that. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> --- Changes in v2: -New to series net/sntp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)