summaryrefslogtreecommitdiff
path: root/hw/arm_boot.c
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-01 17:56:37 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-04-01 17:56:37 +0000
commit74287114c98ecb969b7ce4b5c959da8a8a431d0f (patch)
treed82c33d09efeb9dff7a5b9b20324ee507f0458d1 /hw/arm_boot.c
parent4f14e88c5991877085b1090508ee222d6f3ef088 (diff)
downloadqemu-74287114c98ecb969b7ce4b5c959da8a8a431d0f.tar.gz
qemu-74287114c98ecb969b7ce4b5c959da8a8a431d0f.tar.bz2
qemu-74287114c98ecb969b7ce4b5c959da8a8a431d0f.zip
Improved initrd support for mips.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2574 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/arm_boot.c')
-rw-r--r--hw/arm_boot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index dfc00db28a..095b0bb79f 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -101,7 +101,7 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
qemu_register_reset(main_cpu_reset, env);
}
/* Assume that raw images are linux kernels, and ELF images are not. */
- kernel_size = load_elf(kernel_filename, 0, &elf_entry);
+ kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);
entry = elf_entry;
if (kernel_size < 0) {
kernel_size = load_uboot(kernel_filename, &entry, &is_linux);