summaryrefslogtreecommitdiff
path: root/common/command.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:02:05 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:10 +0200
commitb453960d4fdb87b3970d96119b90df2ed024fc4a (patch)
treebb4a98072997b0c45516e8543b603835334c506d /common/command.c
parent65c450b47a62659d522cfa8f4fa1e4e5c60dccd0 (diff)
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>
Diffstat (limited to 'common/command.c')
-rw-r--r--common/command.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/command.c b/common/command.c
index e917975a733..f8bd16b6f58 100644
--- a/common/command.c
+++ b/common/command.c
@@ -42,7 +42,7 @@ U_BOOT_CMD(
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 @@ void install_auto_complete(void)
{
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
}