| Message ID | 20180427095505.25035-2-judge.packham@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/2] net: Add Kconfig option for BOOTP_NTPSERVER | expand |
On Fri, Apr 27, 2018 at 4:55 AM, Chris Packham <judge.packham@gmail.com> wrote: > When the following configuration is set > > # CONFIG_CMD_DHCP is not set > CONFIG_CMD_BOOTP=y > CONFIG_BOOTP_NTPSERVER=y > > The following compile error is observed > > error: used struct type value where scalar is required > if (net_ntp_server) > ^~~~~~~~~~~~~~ We should probably enable CMD_SNTP in devkit8000 so that this code path is compiled on travis. Can you add a patch for that to the series? > > Resolve this by checking net_ntp_server.s_addr instead. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> > --- > > net/bootp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bootp.c b/net/bootp.c > index efa959971c27..9d7cb5d30c14 100644 > --- a/net/bootp.c > +++ b/net/bootp.c > @@ -333,7 +333,7 @@ static void bootp_process_vendor(u8 *ext, int size) > debug("net_nis_domain : %s\n", net_nis_domain); > > #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) > - if (net_ntp_server) > + if (net_ntp_server.s_addr) > debug("net_ntp_server : %pI4\n", &net_ntp_server); > #endif > } > -- > 2.17.0 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On Thu, May 3, 2018 at 12:23 PM Joe Hershberger <joe.hershberger@ni.com> wrote: > On Fri, Apr 27, 2018 at 4:55 AM, Chris Packham <judge.packham@gmail.com> wrote: > > When the following configuration is set > > > > # CONFIG_CMD_DHCP is not set > > CONFIG_CMD_BOOTP=y > > CONFIG_BOOTP_NTPSERVER=y > > > > The following compile error is observed > > > > error: used struct type value where scalar is required > > if (net_ntp_server) > > ^~~~~~~~~~~~~~ > We should probably enable CMD_SNTP in devkit8000 so that this code > path is compiled on travis. Can you add a patch for that to the > series? It's not quite that simple. CONFIG_CMD_DHCP is selected by CONFIG_DISTRO_DEFAULTS. So just turning on CMD_SNTP doesn't catch this. It'd be a fairly invasive change to disable CONFIG_DISTRO_DEFAULTS. For now I'll send a v2 series with just the changes for 1/2. > > > > Resolve this by checking net_ntp_server.s_addr instead. > > > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > Acked-by: Joe Hershberger <joe.hershberger@ni.com> > > --- > > > > net/bootp.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/bootp.c b/net/bootp.c > > index efa959971c27..9d7cb5d30c14 100644 > > --- a/net/bootp.c > > +++ b/net/bootp.c > > @@ -333,7 +333,7 @@ static void bootp_process_vendor(u8 *ext, int size) > > debug("net_nis_domain : %s\n", net_nis_domain); > > > > #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) > > - if (net_ntp_server) > > + if (net_ntp_server.s_addr) > > debug("net_ntp_server : %pI4\n", &net_ntp_server); > > #endif > > } > > -- > > 2.17.0 > > > > _______________________________________________ > > U-Boot mailing list > > U-Boot@lists.denx.de > > https://lists.denx.de/listinfo/u-boot
On Thu, May 3, 2018 at 3:17 AM, Chris Packham <judge.packham@gmail.com> wrote: > On Thu, May 3, 2018 at 12:23 PM Joe Hershberger <joe.hershberger@ni.com> > wrote: > >> On Fri, Apr 27, 2018 at 4:55 AM, Chris Packham <judge.packham@gmail.com> > wrote: >> > When the following configuration is set >> > >> > # CONFIG_CMD_DHCP is not set >> > CONFIG_CMD_BOOTP=y >> > CONFIG_BOOTP_NTPSERVER=y >> > >> > The following compile error is observed >> > >> > error: used struct type value where scalar is required >> > if (net_ntp_server) >> > ^~~~~~~~~~~~~~ > >> We should probably enable CMD_SNTP in devkit8000 so that this code >> path is compiled on travis. Can you add a patch for that to the >> series? > > It's not quite that simple. CONFIG_CMD_DHCP is selected by > CONFIG_DISTRO_DEFAULTS. So just turning on CMD_SNTP doesn't catch this. > It'd be a fairly invasive change to disable CONFIG_DISTRO_DEFAULTS. For now > I'll send a v2 series with just the changes for 1/2. Sounds good. Maybe it would be easier to enable the combo needed to instigate this on a board that does not use DISTRO_DEFAULTS. > >> > >> > Resolve this by checking net_ntp_server.s_addr instead. >> > >> > Signed-off-by: Chris Packham <judge.packham@gmail.com> > >> Acked-by: Joe Hershberger <joe.hershberger@ni.com> > >> > --- >> > >> > net/bootp.c | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/net/bootp.c b/net/bootp.c >> > index efa959971c27..9d7cb5d30c14 100644 >> > --- a/net/bootp.c >> > +++ b/net/bootp.c >> > @@ -333,7 +333,7 @@ static void bootp_process_vendor(u8 *ext, int size) >> > debug("net_nis_domain : %s\n", net_nis_domain); >> > >> > #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) >> > - if (net_ntp_server) >> > + if (net_ntp_server.s_addr) >> > debug("net_ntp_server : %pI4\n", &net_ntp_server); >> > #endif >> > } >> > -- >> > 2.17.0 >> > >> > _______________________________________________ >> > U-Boot mailing list >> > U-Boot@lists.denx.de >> > https://lists.denx.de/listinfo/u-boot > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/net/bootp.c b/net/bootp.c index efa959971c27..9d7cb5d30c14 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -333,7 +333,7 @@ static void bootp_process_vendor(u8 *ext, int size) debug("net_nis_domain : %s\n", net_nis_domain); #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER) - if (net_ntp_server) + if (net_ntp_server.s_addr) debug("net_ntp_server : %pI4\n", &net_ntp_server); #endif }
When the following configuration is set # CONFIG_CMD_DHCP is not set CONFIG_CMD_BOOTP=y CONFIG_BOOTP_NTPSERVER=y The following compile error is observed error: used struct type value where scalar is required if (net_ntp_server) ^~~~~~~~~~~~~~ Resolve this by checking net_ntp_server.s_addr instead. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)