diff options
| author |   ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-12-23 14:18:40 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-12-23 14:18:40 +0000 |
| commit | 9042c0e20de166542b603621fd30dc8be95dfd4d (patch) | |
| tree | 84ea028032cb2c70fff393af4d94854eea585f3f /hw/mips_r4k.c | |
| parent | Use memory barriers in FORCE_RET / RETURN. (diff) | |
| download | qemu-kvm-9042c0e20de166542b603621fd30dc8be95dfd4d.tar.gz qemu-kvm-9042c0e20de166542b603621fd30dc8be95dfd4d.tar.bz2 qemu-kvm-9042c0e20de166542b603621fd30dc8be95dfd4d.zip | |
Check ELF binaries for machine type and endianness.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2274 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_r4k.c')
| -rw-r--r-- | hw/mips_r4k.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index cf52a0358..d72d768a0 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -11,7 +11,6 @@ #define BIOS_FILENAME "mips_bios.bin" //#define BIOS_FILENAME "system.bin" -#define KERNEL_LOAD_ADDR (int32_t)0x80010000 #ifdef MIPS_HAS_MIPS64 #define INITRD_LOAD_ADDR (int64_t)0x80800000 #else @@ -86,14 +85,9 @@ void load_kernel (CPUState *env, int ram_size, const char *kernel_filename, entry = (int32_t)entry; env->PC = entry; } else { - kernel_size = load_image(kernel_filename, - phys_ram_base + KERNEL_LOAD_ADDR + VIRT_TO_PHYS_ADDEND); - if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); - exit(1); - } - env->PC = KERNEL_LOAD_ADDR; + fprintf(stderr, "qemu: could not load kernel '%s'\n", + kernel_filename); + exit(1); } /* load initrd */ |