Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

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

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 1adbd42b1bc3c55e9aec82861f49981fb1a62962..bfc1db21d2306e09efd47bbacc13c28e357f4ca8 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -27,10 +27,13 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
-#include <syscall.h>
 
-
-/* -------------------------------------------------------------------- */
+/* Allow ports to override the default behavior */
+__attribute__((weak))
+unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
+{
+       return entry (argc, argv);
+}
 
 int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -38,7 +41,7 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     rcode = 0;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -50,7 +53,7 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         * pass address parameter as argv[0] (aka command name),
         * and all remaining args
         */
-       rc = ((ulong (*)(int, char *[]))addr) (--argc, &argv[1]);
+       rc = do_go_exec ((void *)addr, argc - 1, argv + 1);
        if (rc != 0) rcode = 1;
 
        printf ("## Application terminated, rc = 0x%lX\n", rc);
@@ -59,17 +62,17 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 /* -------------------------------------------------------------------- */
 
-cmd_tbl_t U_BOOT_CMD(GO) = MK_CMD_ENTRY(
-       "go", CFG_MAXARGS, 1,   do_go,
-       "go      - start application at address 'addr'\n",
+U_BOOT_CMD(
+       go, CONFIG_SYS_MAXARGS, 1,      do_go,
+       "start application at address 'addr'",
        "addr [arg ...]\n    - start application at address 'addr'\n"
-       "      passing 'arg' as arguments\n"
+       "      passing 'arg' as arguments"
 );
 
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
-cmd_tbl_t U_BOOT_CMD(RESET) = MK_CMD_ENTRY(
-       "reset", 1, 0,  do_reset,
-       "reset   - Perform RESET of the CPU\n",
-       NULL
+U_BOOT_CMD(
+       reset, 1, 0,    do_reset,
+       "Perform RESET of the CPU",
+       ""
 );