Fix console_buffer size conflict error.

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

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 9d4f0265981a350402fea7a94b6b8568ade0b694..bfc1db21d2306e09efd47bbacc13c28e357f4ca8 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -28,25 +28,11 @@
 #include <command.h>
 #include <net.h>
 
-#if defined(CONFIG_I386)
-DECLARE_GLOBAL_DATA_PTR;
-#endif
-
-static inline void go_setup(int argc, char *argv[])
+/* Allow ports to override the default behavior */
+__attribute__((weak))
+unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
 {
-#if defined(CONFIG_I386)
-       /*
-        * x86 does not use a dedicated register to pass the pointer
-        * to the global_data
-        */
-       argv[0] = (char *)gd;
-
-#elif defined(CONFIG_BLACKFIN)
-       if (dcache_status ())
-               dcache_disable ();
-       if (icache_status ())
-               icache_disable ();
-#endif
+       return entry (argc, argv);
 }
 
 int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -55,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;
        }
 
@@ -63,20 +49,11 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        printf ("## Starting application at 0x%08lX ...\n", addr);
 
-       go_setup(argc, argv);
-
-#if defined(CONFIG_NIOS)
-       /*
-        * Nios function pointers are address >> 1
-        */
-       addr >>= 1;
-#endif
-
        /*
         * 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);
@@ -86,16 +63,16 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 /* -------------------------------------------------------------------- */
 
 U_BOOT_CMD(
-       go, CFG_MAXARGS, 1,     do_go,
-       "go      - start application at address 'addr'\n",
+       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[]);
 
 U_BOOT_CMD(
        reset, 1, 0,    do_reset,
-       "reset   - Perform RESET of the CPU\n",
-       NULL
+       "Perform RESET of the CPU",
+       ""
 );