common/ non-cmd: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

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

diff --git a/common/main.c b/common/main.c
index a00ebc194c576460908e0d4680e8f807de4ab3fb..99693f4fcf6ecd3671ef59bd06598b26a9ed9951 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -1311,7 +1311,7 @@ int run_command (const char *cmd, int flag)
                        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 @@ int run_command (const char *cmd, int flag)
 
 /****************************************************************************/
 
-#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;