diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:02:49 -0500 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:23:14 +0200 | 
| commit | 6e2115acb6a892d53a6881bf253ae41d3df39156 (patch) | |
| tree | 0e172685b76a40bf48460793dec4f67c55768115 /net/nfs.c | |
| parent | 45cdb9b72c94655c7308b464a2666057c0b286e0 (diff) | |
| download | olio-uboot-2014.01-6e2115acb6a892d53a6881bf253ae41d3df39156.tar.xz olio-uboot-2014.01-6e2115acb6a892d53a6881bf253ae41d3df39156.zip | |
net/: 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 'net/nfs.c')
| -rw-r--r-- | net/nfs.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| @@ -31,7 +31,8 @@  /*#define NFS_DEBUG*/ -#if ((CONFIG_COMMANDS & CFG_CMD_NET) && (CONFIG_COMMANDS & CFG_CMD_NFS)) +#if (((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \ +    && ((CONFIG_COMMANDS & CFG_CMD_NFS)) || defined(CONFIG_CMD_NFS))  #define HASHES_PER_LINE 65	/* Number of "loading" hashes per line	*/  #define NFS_TIMEOUT 60 |