diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-07-09 22:08:34 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-07-09 22:08:34 -0500 |
| commit | 1fe80d79c5c4e52d3410a7ab4b8515da095cdab3 (patch) | |
| tree | 2544ec984aed176006f720f0ea903509e5e97bba /common/cmd_net.c | |
| parent | d3b8c1a743dcd31625c99e6a44590f207eb00028 (diff) | |
| download | talos-obmc-uboot-1fe80d79c5c4e52d3410a7ab4b8515da095cdab3.tar.gz talos-obmc-uboot-1fe80d79c5c4e52d3410a7ab4b8515da095cdab3.zip | |
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>
Diffstat (limited to 'common/cmd_net.c')
| -rw-r--r-- | common/cmd_net.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/cmd_net.c b/common/cmd_net.c index da55f14a2e..8f766c8dbb 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -128,7 +128,7 @@ static void netboot_update_env (void) 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 @@ static void netboot_update_env (void) 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); |
