summaryrefslogtreecommitdiff
path: root/common/cmd_boot.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-10-08 23:26:14 +0000
committerwdenk <wdenk>2003-10-08 23:26:14 +0000
commit4a5517094dd30bb1f271403b62e23053301668e6 (patch)
tree55bd5e64828e7645caa5506302e27715cfecdbda /common/cmd_boot.c
parent54387ac931fa7cc92cd45c53798379af1f9adc44 (diff)
downloadu-boot-imx-4a5517094dd30bb1f271403b62e23053301668e6.zip
u-boot-imx-4a5517094dd30bb1f271403b62e23053301668e6.tar.gz
u-boot-imx-4a5517094dd30bb1f271403b62e23053301668e6.tar.bz2
* Patch by Scott McNutt, 04 Oct 2003:
- add support for Altera Nios-32 CPU - add support for Nios Cyclone Development Kit (DK-1C20) * Patch by Steven Scholz, 29 Sep 2003: - A second parameter for bootm overwrites the load address for "Standalone Application" images. - bootm sets environment variable "filesize" to the resulting (uncompressed) data length for "Standalone Application" images when autostart is set to "no". Now you can do something like if bootm $fpgadata $some_free_ram ; then fpga load 0 $some_free_ram $filesize fi * Patch by Denis Peter, 25 Sept 2003: add support for the MIP405 Rev. C board
Diffstat (limited to 'common/cmd_boot.c')
-rw-r--r--common/cmd_boot.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index b2f0331..5b58d4e 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -59,7 +59,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);