dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge with /home/wd/git/u-boot/custodian/u-boot-testing

Browse Source
This commit is contained in:
Wolfgang Denk
2007-08-06 01:11:08 +02:00
parent b1b54e3520 5728be389e
commit f2c2a937d8
809 changed files with 11099 additions and 15872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/main.c
View File

@@ -1317,7 +1317,7 @@ int run_command (const char *cmd, int flag)
continue;
}
#if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
#if defined(CONFIG_CMD_BOOTD)
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
#ifdef DEBUG_PARSER
@@ -1331,7 +1331,7 @@ int run_command (const char *cmd, int flag)
flag |= CMD_FLAG_BOOTD;
}
}
#endif /* CFG_CMD_BOOTD */
#endif
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
@@ -1350,7 +1350,7 @@ int run_command (const char *cmd, int flag)
/****************************************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_RUN)
#if defined(CONFIG_CMD_RUN)
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
@@ -1378,4 +1378,4 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
return 0;
}
#endif /* CFG_CMD_RUN */
#endif