commit b453960d4fdb87b3970d96119b90df2ed024fc4a
author Jon Loeliger <jdl@jdl.com> Mon Jun 11 19:02:05 2007 -0500
committer Wolfgang Denk <wd@denx.de> Wed Jul 04 00:23:10 2007 +0200
tree bb4a98072997b0c45516e8543b603835334c506d
parent 65c450b47a62659d522cfa8f4fa1e4e5c60dccd0

common/ non-cmd: 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>

common/main.c

diff --git a/common/main.c b/common/main.c
index a00ebc1..99693f4 100644
--- a/common/main.c
+++ b/common/main.c
@@ -1311,7 +1311,7 @@
 			continue;
 		}
 
-#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
+#if (CONFIG_COMMANDS & CFG_CMD_BOOTD) || defined(CONFIG_CMD_BOOTD)
 		/* avoid "bootd" recursion */
 		if (cmdtp->cmd == do_bootd) {
 #ifdef DEBUG_PARSER
@@ -1344,7 +1344,7 @@
 
 /****************************************************************************/
 
-#if (CONFIG_COMMANDS & CFG_CMD_RUN)
+#if (CONFIG_COMMANDS & CFG_CMD_RUN) || defined(CONFIG_CMD_RUN)
 int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	int i;