Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx

[oweals/u-boot.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index 2b4c5547b31af616f5599e475790935823d04344..af2f8cbf7b8c163e74dc8530d89c50f67dc82665 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -42,6 +42,8 @@ U_BOOT_CMD(
        NULL
 );
 
+#if defined(CONFIG_CMD_ECHO)
+
 int
 do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -74,6 +76,8 @@ U_BOOT_CMD(
        "    - echo args to console; \\c suppresses newline\n"
 );
 
+#endif
+
 #ifdef CFG_HUSH_PARSER
 
 int
@@ -405,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 defined(CONFIG_CMD_RUN)
        install_auto_complete_handler("run", var_complete);
 #endif
 }