From 409dbce54b57b85bd229174da86d77ca08508508 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sun, 14 Mar 2010 21:20:59 +0100 Subject: load_elf: replace the address addend by a translation function A few machines need to translate the ELF header addresses into physical addresses. Currently the only possibility is to add a value to the addresses. This patch replaces the addend argument by and a translation function and an opaque passed to the function. A NULL function does not translate the address. The patch also convert all machines that have an addend, simplify the PowerPC kernel loading and fix the MIPS kernel loading using this new feature. Other machines may benefit from this feature. Signed-off-by: Aurelien Jarno --- hw/elf_ops.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'hw/elf_ops.h') diff --git a/hw/elf_ops.h b/hw/elf_ops.h index 14b9ec0444..69c07571b6 100644 --- a/hw/elf_ops.h +++ b/hw/elf_ops.h @@ -184,7 +184,9 @@ static int glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab, return -1; } -static int glue(load_elf, SZ)(const char *name, int fd, int64_t address_offset, +static int glue(load_elf, SZ)(const char *name, int fd, + uint64_t (*translate_fn)(void *, uint64_t), + void *translate_opaque, int must_swab, uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr, int elf_machine, int clear_lsb) @@ -253,7 +255,11 @@ static int glue(load_elf, SZ)(const char *name, int fd, int64_t address_offset, } /* address_offset is hack for kernel images that are linked at the wrong physical address. */ - addr = ph->p_paddr + address_offset; + if (translate_fn) { + addr = translate_fn(translate_opaque, ph->p_paddr); + } else { + addr = ph->p_paddr; + } snprintf(label, sizeof(label), "phdr #%d: %s", i, name); rom_add_blob_fixed(label, data, mem_size, addr); -- cgit v1.2.3