lwmon5: fix offset error in sysmon0 POST

[u-boot] / common / cmd_elf.c

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 63a5593e4343ae16964f4cb369b00cedbeaff6c4..62e5e76ac826ceecfd990c065771cd173529cebf 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -23,8 +23,6 @@
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
-#if defined(CONFIG_CMD_ELF)
-
 #ifndef MAX
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #endif
@@ -32,6 +30,32 @@ DECLARE_GLOBAL_DATA_PTR;
 int valid_elf_image (unsigned long addr);
 unsigned long load_elf_image (unsigned long addr);
 
+/* Allow ports to override the default behavior */
+__attribute__((weak))
+unsigned long do_bootelf_exec (ulong (*entry)(int, char *[]), int argc, char *argv[])
+{
+       unsigned long ret;
+
+       /*
+        * QNX images require the data cache is disabled.
+        * Data cache is already flushed, so just turn it off.
+        */
+       int dcache = dcache_status ();
+       if (dcache)
+               dcache_disable ();
+
+       /*
+        * pass address parameter as argv[0] (aka command name),
+        * and all remaining args
+        */
+       ret = entry (argc, argv);
+
+       if (dcache)
+               dcache_enable ();
+
+       return ret;
+}
+
 /* ======================================================================
  * Interpreter command to boot an arbitrary ELF image from memory.
  * ====================================================================== */
@@ -55,18 +79,11 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        printf ("## Starting application at 0x%08lx ...\n", addr);
 
-       /*
-        * QNX images require the data cache is disabled.
-        * Data cache is already flushed, so just turn it off.
-        */
-       if (dcache_status ())
-               dcache_disable ();
-
        /*
         * pass address parameter as argv[0] (aka command name),
         * and all remaining args
         */
-       rc = ((ulong (*)(int, char *[])) addr) (--argc, &argv[1]);
+       rc = do_bootelf_exec ((void *)addr, argc - 1, argv + 1);
        if (rc != 0)
                rcode = 1;
 
@@ -323,5 +340,3 @@ U_BOOT_CMD(
        "bootvx  - Boot vxWorks from an ELF image\n",
        " [address] - load address of vxWorks ELF image.\n"
 );
-
-#endif