On Wed, Sep 05, 2012 at 03:11:13PM +0200, Kevin Wolf wrote:
> Am 05.09.2012 14:56, schrieb Henning Schild:
> > Find a hopefully proper patch attached. Take it or leave it.
> >
> > Signed-off-by: Henning Schild <henn...@hennsch.de>
>
> Reviewed-by: Kevin Wolf <kw...@redhat.com>
>
> Aurelien, I think in the past you committed some changes in this area.
> Does this look good to you and can you get it committed?
>
Thanks, committed.
> > ---
> > hw/elf_ops.h | 11 +++++++++++
> > 1 files changed, 11 insertions(+), 0 deletions(-)
> >
> > diff --git a/hw/elf_ops.h b/hw/elf_ops.h
> > index fa65ce2..731a983 100644
> > --- a/hw/elf_ops.h
> > +++ b/hw/elf_ops.h
> > @@ -269,6 +269,17 @@ static int glue(load_elf, SZ)(const char *name,
> > int fd,
> > addr = ph->p_paddr;
> > }
> >
> > + /* the entry pointer in the ELF header is a virtual
> > + * address, if the text segments paddr and vaddr differ
> > + * we need to adjust the entry */
> > + if (pentry && !translate_fn &&
> > + ph->p_vaddr != ph->p_paddr &&
> > + ehdr.e_entry >= ph->p_vaddr &&
> > + ehdr.e_entry < ph->p_vaddr + ph->p_filesz &&
> > + ph->p_flags & PF_X) {
> > + *pentry = ehdr.e_entry - ph->p_vaddr + ph->p_paddr;
> > + }
> > +
> > snprintf(label, sizeof(label), "phdr #%d: %s", i, name);
> > rom_add_blob_fixed(label, data, mem_size, addr);
> >
> >
>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurel...@aurel32.net http://www.aurel32.net
