minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

allow ports to override bootelf behavior

Browse Source 
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.
This commit is contained in:
Mike Frysinger 2008-04-13 19:42:18 -04:00 committed by Wolfgang Denk
parent a4b46ed6b3
commit 017e9b7925
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/cmd_elf.c
View File

@ -27,23 +27,34 @@ DECLARE_GLOBAL_DATA_PTR;
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif #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. * QNX images require the data cache is disabled.
* Data cache is already flushed, so just turn it off. * Data cache is already flushed, so just turn it off.
*/ */
if (dcache_status ()) int dcache = dcache_status ();
if (dcache)
dcache_disable (); dcache_disable ();
#ifdef CONFIG_BLACKFIN /*
if (icache_status ()) * pass address parameter as argv[0] (aka command name),
icache_disable (); * and all remaining args
#endif */
} ret = entry (argc, argv);
int valid_elf_image (unsigned long addr); if (dcache)
unsigned long load_elf_image (unsigned long addr); dcache_enable ();
return ret;
}
/* ====================================================================== /* ======================================================================
* Interpreter command to boot an arbitrary ELF image from memory. * 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); printf ("## Starting application at 0x%08lx ...\n", addr);
bootelf_setup(argc, argv);
/* /*
* pass address parameter as argv[0] (aka command name), * pass address parameter as argv[0] (aka command name),
* and all remaining args * 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) if (rc != 0)
rcode = 1; rcode = 1;