Merge with http://www.jdl.com/software/u-boot-86xx.git

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

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index b2f0331dc925c5ea72b935f0e7adde94983fb93b..182e2ab9806bf806bcc84567b745fc79f3bdff58 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -28,14 +28,12 @@
 #include <command.h>
 #include <net.h>
 
-
-/* -------------------------------------------------------------------- */
+#if defined(CONFIG_I386)
+DECLARE_GLOBAL_DATA_PTR;
+#endif
 
 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;
 
@@ -59,7 +57,14 @@ int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
        argv[0] = (char *)gd;
 #endif
+#if !defined(CONFIG_NIOS)
        rc = ((ulong (*)(int, char *[]))addr) (--argc, &argv[1]);
+#else
+       /*
+        * Nios function pointers are address >> 1
+        */
+       rc = ((ulong (*)(int, char *[]))(addr>>1)) (--argc, &argv[1]);
+#endif
        if (rc != 0) rcode = 1;
 
        printf ("## Application terminated, rc = 0x%lX\n", rc);
@@ -78,7 +83,7 @@ U_BOOT_CMD(
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
 
 U_BOOT_CMD(
-       reset, 1, 0,    do_reset,
+       reset, CFG_MAXARGS, 1,  do_reset,
        "reset   - Perform RESET of the CPU\n",
        NULL
 );