projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
common
/
main.c
diff --git
a/common/main.c
b/common/main.c
index
a00ebc1
..
379695c
100644
(file)
--- a/
common/main.c
+++ b/
common/main.c
@@
-44,6
+44,12
@@
DECLARE_GLOBAL_DATA_PTR;
#endif
DECLARE_GLOBAL_DATA_PTR;
#endif
+/*
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+void inline __show_boot_progress (int val) {}
+void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+
#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
#endif
#if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); /* for do_reset() prototype */
#endif
@@
-1311,7
+1317,7
@@
int run_command (const char *cmd, int flag)
continue;
}
continue;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_BOOTD)
+#if
defined(CONFI
G_CMD_BOOTD)
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
#ifdef DEBUG_PARSER
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
#ifdef DEBUG_PARSER
@@
-1325,7
+1331,7
@@
int run_command (const char *cmd, int flag)
flag |= CMD_FLAG_BOOTD;
}
}
flag |= CMD_FLAG_BOOTD;
}
}
-#endif
/* CFG_CMD_BOOTD */
+#endif
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
/* OK - call function to do the command */
if ((cmdtp->cmd) (cmdtp, flag, argc, argv) != 0) {
@@
-1344,7
+1350,7
@@
int run_command (const char *cmd, int flag)
/****************************************************************************/
/****************************************************************************/
-#if
(CONFIG_COMMANDS & CF
G_CMD_RUN)
+#if
defined(CONFI
G_CMD_RUN)
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int i;
@@
-1372,4
+1378,4
@@
int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
}
return 0;
}
}
return 0;
}
-#endif
/* CFG_CMD_RUN */
+#endif