summaryrefslogtreecommitdiff
path: root/net/rarp.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:02:49 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:14 +0200
commit6e2115acb6a892d53a6881bf253ae41d3df39156 (patch)
tree0e172685b76a40bf48460793dec4f67c55768115 /net/rarp.c
parent45cdb9b72c94655c7308b464a2666057c0b286e0 (diff)
downloadu-boot-imx-6e2115acb6a892d53a6881bf253ae41d3df39156.zip
u-boot-imx-6e2115acb6a892d53a6881bf253ae41d3df39156.tar.gz
u-boot-imx-6e2115acb6a892d53a6881bf253ae41d3df39156.tar.bz2
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/rarp.c')
-rw-r--r--net/rarp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rarp.c b/net/rarp.c
index 1ba60e8..39cabb3 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -29,7 +29,7 @@
#include "rarp.h"
#include "tftp.h"
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#define TIMEOUT 5 /* Seconds before trying BOOTP again */
#ifndef CONFIG_NET_RETRY_COUNT
@@ -59,7 +59,7 @@ RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
*/
NetState = NETLOOP_SUCCESS;
return;
-#if (CONFIG_COMMANDS & CFG_CMD_NFS)
+#if (CONFIG_COMMANDS & CFG_CMD_NFS) || defined(CONFIG_CMD_NFS)
} else if ((s != NULL) && !strcmp(s, "NFS")) {
NfsStart();
return;