mpc83xx: Fix errors when CONFIG_OF_LIBFDT is enabled

[karo-tx-uboot.git] / common / command.c

diff --git a/common/command.c b/common/command.c
index 2b48a1c9155da6316702e72c784b5a437782914e..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
@@ -89,12 +93,12 @@ do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #if 0
        {
                printf("test:");
-               left = 1; 
+               left = 1;
                while (argv[left])
                        printf(" %s", argv[left++]);
        }
 #endif
-       
+
        last_expr = 0;
        left = argc - 1; ap = argv + 1;
        if (left > 0 && strcmp(ap[0], "!") == 0) {
@@ -136,9 +140,9 @@ do_test (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                if (adv == 2) {
                        if (strcmp(ap[0], "-z") == 0)
-                               expr = strlen(ap[1]) == 0 ? 0 : 1;
-                       else if (strcmp(ap[0], "-n") == 0)
                                expr = strlen(ap[1]) == 0 ? 1 : 0;
+                       else if (strcmp(ap[0], "-n") == 0)
+                               expr = strlen(ap[1]) == 0 ? 0 : 1;
                        else {
                                expr = 1;
                                break;
@@ -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
 }