| Message ID | 1412801889-14400-12-git-send-email-jeroen@myspectrum.nl |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Wed, Oct 08, 2014 at 10:57:31PM +0200, Jeroen Hofstee wrote: > do_bootelf_exec was a weak function without a prototype nor > and strong version. Just make it static. > > Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Applied to u-boot/master, thanks!
diff --git a/common/cmd_elf.c b/common/cmd_elf.c index ab9c7e3..2f229d7 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -28,8 +28,7 @@ static unsigned long load_elf_image_phdr(unsigned long addr); static unsigned long load_elf_image_shdr(unsigned long addr); /* Allow ports to override the default behavior */ -__attribute__((weak)) -unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]), +static unsigned long do_bootelf_exec(ulong (*entry)(int, char * const[]), int argc, char * const argv[]) { unsigned long ret;
do_bootelf_exec was a weak function without a prototype nor and strong version. Just make it static. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> --- common/cmd_elf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)