diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:03:34 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:35:14 +0200 |
| commit | 72a074cec68e5bad60d63206c050974e08afd804 (patch) | |
| tree | 27f9387a104c89364d5897490e3be82df2e67d7c /include/net.h | |
| parent | 5fcf543e0b6628c76ff48705b1b0566bfd11507b (diff) | |
| download | u-boot-imx-72a074cec68e5bad60d63206c050974e08afd804.zip u-boot-imx-72a074cec68e5bad60d63206c050974e08afd804.tar.gz u-boot-imx-72a074cec68e5bad60d63206c050974e08afd804.tar.bz2 | |
include/ non-config: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.
All transformations are of the form:
Before:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
#if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net.h b/include/net.h index 461e038..853f55a 100644 --- a/include/net.h +++ b/include/net.h @@ -341,17 +341,17 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP /* from net/net.c */ extern char BootFile[128]; /* Boot File name */ -#if (CONFIG_COMMANDS & CFG_CMD_PING) +#if (CONFIG_COMMANDS & CFG_CMD_PING) || defined(CONFIG_CMD_PING) extern IPaddr_t NetPingIP; /* the ip address to ping */ #endif -#if (CONFIG_COMMANDS & CFG_CMD_CDP) +#if (CONFIG_COMMANDS & CFG_CMD_CDP) || defined(CONFIG_CMD_CDP) /* when CDP completes these hold the return values */ extern ushort CDPNativeVLAN; extern ushort CDPApplianceVLAN; #endif -#if (CONFIG_COMMANDS & CFG_CMD_SNTP) +#if (CONFIG_COMMANDS & CFG_CMD_SNTP) || defined(CONFIG_CMD_SNTP) extern IPaddr_t NetNtpServerIP; /* the ip address to NTP */ extern int NetTimeOffset; /* offset time from UTC */ #endif |