V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

net: Fix compile errors when SNTP enabled and not DATE 

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>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger 2015-04-08 01:41:24 -05:00 committed by Simon Glass
parent 717234e002
commit 3c56fb8280
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/sntp.c
View File

@ -50,17 +50,20 @@ static void sntp_timeout_handler(void)
static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip, static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
unsigned src, unsigned len) unsigned src, unsigned len)
{ {
#ifdef CONFIG_TIMESTAMP
struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt; struct sntp_pkt_t *rpktp = (struct sntp_pkt_t *)pkt;
struct rtc_time tm; struct rtc_time tm;
ulong seconds; ulong seconds;
#endif
debug("%s\n", __func__); debug("%s\n", __func__);
if (dest != sntp_our_port) if (dest != sntp_our_port)
return; 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. * we simply ignore the sub-second field.
*/ */
memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong)); 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", printf("Date: %4d-%02d-%02d Time: %2d:%02d:%02d\n",
tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_year, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
#endif
net_set_state(NETLOOP_SUCCESS); net_set_state(NETLOOP_SUCCESS);
} }