diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2010-03-14 21:20:59 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-03-16 08:38:05 +0100 |
| commit | 409dbce54b57b85bd229174da86d77ca08508508 (patch) | |
| tree | 61aaddb4700595752b34e01db383074463336329 /hw/axis_dev88.c | |
| parent | cb66ffcf9e298dc1bfc11682172ff9472bcd4495 (diff) | |
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 <aurelien@aurel32.net>
Diffstat (limited to 'hw/axis_dev88.c')
| -rw-r--r-- | hw/axis_dev88.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 1a6664957..5516e4252 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -249,6 +249,11 @@ static void main_cpu_reset(void *opaque) env->pc = bootstrap_pc; } +static uint64_t translate_kernel_address(void *opaque, uint64_t addr) +{ + return addr - 0x80000000LL; +} + static void axisdev88_init (ram_addr_t ram_size, const char *boot_device, @@ -345,7 +350,7 @@ void axisdev88_init (ram_addr_t ram_size, /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis devboard SDK. */ - kernel_size = load_elf(kernel_filename, -0x80000000LL, + kernel_size = load_elf(kernel_filename, translate_kernel_address, NULL, &entry, NULL, &high, 0, ELF_MACHINE, 0); bootstrap_pc = entry; if (kernel_size < 0) { |