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/command.c

diff --git a/common/command.c b/common/command.c
index e917975..f8bd16b 100644
--- a/common/command.c
+++ b/common/command.c
@@ -42,7 +42,7 @@
 	NULL
 );
 
-#if (CONFIG_COMMANDS & CFG_CMD_ECHO)
+#if (CONFIG_COMMANDS & CFG_CMD_ECHO) || defined(CONFIG_CMD_ECHO)
 
 int
 do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -409,7 +409,7 @@
 {
 	install_auto_complete_handler("printenv", var_complete);
 	install_auto_complete_handler("setenv", var_complete);
-#if (CONFIG_COMMANDS & CFG_CMD_RUN)
+#if (CONFIG_COMMANDS & CFG_CMD_RUN) || defined(CONFIG_CMD_RUN)
 	install_auto_complete_handler("run", var_complete);
 #endif
 }