[Motion-PRO] Enable Flat Device Tree support and modify default environment

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

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index a0bc04ba60ce4ea899dac8bdca7d0b17c8c698ce..e68f16f9da022aa805d5e5f79fec0fa7f9f229d2 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -26,12 +26,11 @@
  */
 #include <common.h>
 #include <command.h>
-#include <cmd_autoscript.h>
 #include <net.h>
-#include <syscall.h>
 
-
-/* -------------------------------------------------------------------- */
+#if defined(CONFIG_I386)
+DECLARE_GLOBAL_DATA_PTR;
+#endif
 
 int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -51,7 +50,21 @@ 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
+#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);
@@ -60,8 +73,8 @@ 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,
+U_BOOT_CMD(
+       go, CFG_MAXARGS, 1,     do_go,
        "go      - start application at address 'addr'\n",
        "addr [arg ...]\n    - start application at address 'addr'\n"
        "      passing 'arg' as arguments\n"
@@ -69,8 +82,8 @@ cmd_tbl_t U_BOOT_CMD(GO) = MK_CMD_ENTRY(
 
 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,
+U_BOOT_CMD(
+       reset, 1, 0,    do_reset,
        "reset   - Perform RESET of the CPU\n",
        NULL
 );