Prepare v2013.07-rc2

[karo-tx-uboot.git] / include / command.h

diff --git a/include/command.h b/include/command.h
index 476e7cffc2856523df090a54d73b03926e1b73ba..9e05ddc1329ae2ce60fe7b2bfc84e6da66b41445 100644 (file)
--- a/include/command.h
+++ b/include/command.h
@@ -110,6 +110,8 @@ static inline int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd)
 }
 #endif
 
+extern int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+
 extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
                           char *const argv[]);
 
@@ -139,10 +141,12 @@ enum command_ret_t {
  * @param repeatable   This function sets this to 0 if the command is not
  *                     repeatable. If the command is repeatable, the value
  *                     is left unchanged.
+ * @param ticks                If ticks is not null, this function set it to the
+ *                     number of ticks the command took to complete.
  * @return 0 if the command succeeded, 1 if it failed
  */
 int cmd_process(int flag, int argc, char * const argv[],
-                              int *repeatable);
+                              int *repeatable, unsigned long *ticks);
 
 #endif /* __ASSEMBLY__ */
 
@@ -173,7 +177,7 @@ int cmd_process(int flag, int argc, char * const argv[],
                                        _usage, _help, NULL)
 
 #define U_BOOT_CMD_COMPLETE(_name, _maxargs, _rep, _cmd, _usage, _help, _comp) \
-       ll_entry_declare(cmd_tbl_t, _name, cmd, cmd) =                  \
+       ll_entry_declare(cmd_tbl_t, _name, cmd) =                       \
                U_BOOT_CMD_MKENT_COMPLETE(_name, _maxargs, _rep, _cmd,  \
                                                _usage, _help, _comp);