Finally retire cmd_confdefs.h and CONFIG_BOOTP_MASK!
All of the choices for CONFIG_BOOTP_ are now documented in
the README file. You must now individually select exactly
the set that you want using a series of
#define CONFIG_BOOTP_<x>
statements in the board port config files now.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
diff --git a/common/cmd_net.c b/common/cmd_net.c
index da55f14..8f766c8 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -128,7 +128,7 @@
ip_to_string (NetOurDNSIP, tmp);
setenv ("dnsip", tmp);
}
-#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_DNS2)
+#if defined(CONFIG_BOOTP_DNS2)
if (NetOurDNS2IP) {
ip_to_string (NetOurDNS2IP, tmp);
setenv ("dnsip2", tmp);
@@ -138,14 +138,14 @@
setenv ("domain", NetOurNISDomain);
#if defined(CONFIG_CMD_SNTP) \
- && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_TIMEOFFSET)
+ && defined(CONFIG_BOOTP_TIMEOFFSET)
if (NetTimeOffset) {
sprintf (tmp, "%d", NetTimeOffset);
setenv ("timeoffset", tmp);
}
#endif
#if defined(CONFIG_CMD_SNTP) \
- && (CONFIG_BOOTP_MASK & CONFIG_BOOTP_NTPSERVER)
+ && defined(CONFIG_BOOTP_NTPSERVER)
if (NetNtpServerIP) {
ip_to_string (NetNtpServerIP, tmp);
setenv ("ntpserverip", tmp);