diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-09-20 14:58:02 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-20 14:58:02 +0000 |
| commit | ca20cf32ab3d945155141ef737f5d08ebb373e1d (patch) | |
| tree | 45515350fdf7b5322658095beec591565a78506d /hw/arm_boot.c | |
| parent | a333cd7166d12397635e16dcade28da5ba8ec7b3 (diff) | |
Compile loader only once
Callers must pass ELF machine, byte swapping and symbol LSB clearing
information to ELF loader. A.out loader needs page size information, pass
that too as a parameter.
Extract prototypes to a separate file. Move loader.[ch] and elf_ops.h under hw.
Adjust callers. Also use target_phys_addr_t instead of target_ulong for
addresses: loader addresses aren't virtual.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/arm_boot.c')
| -rw-r--r-- | hw/arm_boot.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 35f0130db1..a8a38c5a36 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -10,6 +10,8 @@ #include "hw.h" #include "arm-misc.h" #include "sysemu.h" +#include "loader.h" +#include "elf.h" #define KERNEL_ARGS_ADDR 0x100 #define KERNEL_LOAD_ADDR 0x00010000 @@ -191,7 +193,8 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) int n; int is_linux = 0; uint64_t elf_entry; - target_ulong entry; + target_phys_addr_t entry; + int big_endian; /* Load the kernel. */ if (!info->kernel_filename) { @@ -206,8 +209,15 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) qemu_register_reset(main_cpu_reset, env); } +#ifdef TARGET_WORDS_BIGENDIAN + big_endian = 1; +#else + big_endian = 0; +#endif + /* Assume that raw images are linux kernels, and ELF images are not. */ - kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL); + kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL, + big_endian, ELF_MACHINE, 1); entry = elf_entry; if (kernel_size < 0) { kernel_size = load_uimage(info->kernel_filename, &entry, NULL, |