Change the bootelf setup function into a dedicated weak function called
do_bootelf_exec. This way ports can control the behavior however they
like before/after calling the ELF entry point.
---
common/cmd_elf.c | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 4683554..62e5e76 100644
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -27,23 +27,34 @@ DECLARE_GLOBAL_DATA_PTR;
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
-static inline void bootelf_setup(int argc, char *argv[])
+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.
*/
- if (dcache_status ())
+ int dcache = dcache_status ();
+ if (dcache)
dcache_disable ();
-#ifdef CONFIG_BLACKFIN
- if (icache_status ())
- icache_disable ();
-#endif
-}
+ /*
+ * pass address parameter as argv[0] (aka command name),
+ * and all remaining args
+ */
+ ret = entry (argc, argv);
-int valid_elf_image (unsigned long addr);
-unsigned long load_elf_image (unsigned long addr);
+ if (dcache)
+ dcache_enable ();
+
+ return ret;
+}
/* ======================================================================
* Interpreter command to boot an arbitrary ELF image from memory.
@@ -68,13 +79,11 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char
*argv[])
printf ("## Starting application at 0x%08lx ...\n", addr);
- bootelf_setup(argc, argv);
-
/*
* 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;
--
1.5.5
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
