Update CHANGELOG.

[platform/kernel/u-boot.git] / common / cmd_boot.c

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index b2f0331..d83f5af 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -28,14 +28,15 @@
 #include <command.h>
 #include <net.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[])
 {
-#if defined(CONFIG_I386)
-       DECLARE_GLOBAL_DATA_PTR;
-#endif
        ulong   addr, rc;
        int     rcode = 0;
 
@@ -52,14 +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
         */
-#if defined(CONFIG_I386)
-       /*
-        * x86 does not use a dedicated register to pass the pointer
-        * to the global_data
-        */
-       argv[0] = (char *)gd;
-#endif
-       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);