From 6e2115acb6a892d53a6881bf253ae41d3df39156 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Mon, 11 Jun 2007 19:02:49 -0500 Subject: 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 --- net/rarp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/rarp.c') diff --git a/net/rarp.c b/net/rarp.c index 1ba60e803c..39cabb3aca 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; -- cgit From 643d1ab23960950b52e0a2803c2d3ea4c558fa01 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Mon, 9 Jul 2007 17:45:14 -0500 Subject: net/: Remove obsolete references to CONFIG_COMMANDS Signed-off-by: Jon Loeliger --- net/rarp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/rarp.c') diff --git a/net/rarp.c b/net/rarp.c index 39cabb3aca..921d0db3f3 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) || defined(CONFIG_CMD_NET) +#if 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) || defined(CONFIG_CMD_NFS) +#if defined(CONFIG_CMD_NFS) } else if ((s != NULL) && !strcmp(s, "NFS")) { NfsStart(); return; -- cgit From 610f2e9c28a9c101e09fa1b78143cf5f00ed1593 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 10 Jul 2007 11:05:02 -0500 Subject: net/: Remove lingering references to CFG_CMD_* symbols. Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when IDE really wasn't defined/wanted. Signed-off-by: Jon Loeliger --- net/rarp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/rarp.c') diff --git a/net/rarp.c b/net/rarp.c index 921d0db3f3..21dfa529c9 100644 --- a/net/rarp.c +++ b/net/rarp.c @@ -119,4 +119,4 @@ RarpRequest (void) NetSetHandler(RarpHandler); } -#endif /* CFG_CMD_NET */ +#endif -- cgit