From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Frysinger Date: Fri, 1 Feb 2008 10:44:59 -0500 Subject: [U-Boot-Users] [patch] allow ports to override bootelf behavior In-Reply-To: <20070813155047.C419424041@gemini.denx.de> References: <20070813155047.C419424041@gemini.denx.de> Message-ID: <200802011045.00200.vapier@gentoo.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This splits the dcache logic out of do_bootelf into a dedicated weak function called do_bootelf_exec. This way ports can control the behavior before executing an ELF image however they like. Signed-off-by: Mike Frysinger --- diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 2eb7453..5689e2c 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -30,6 +30,31 @@ DECLARE_GLOBAL_DATA_PTR; int valid_elf_image (unsigned long addr); unsigned long load_elf_image (unsigned long addr); +__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. * ====================================================================== */ @@ -53,18 +78,7 @@ 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;