mirror of
https://git.proxmox.com/git/qemu
synced 2025-08-16 12:38:08 +00:00
ARM boot fix (Jason Wessel).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2323 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
adb4796796
commit
72742c8626
@ -80,12 +80,12 @@ void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
|
|||||||
}
|
}
|
||||||
|
|
||||||
kernel_size = load_elf(kernel_filename, 0, &entry);
|
kernel_size = load_elf(kernel_filename, 0, &entry);
|
||||||
if (kernel_size) {
|
if (kernel_size >= 0) {
|
||||||
/* An ELF image. Jump to the entry point. */
|
/* An ELF image. Jump to the entry point. */
|
||||||
env->regs[15] = entry & 0xfffffffe;
|
env->regs[15] = entry & 0xfffffffe;
|
||||||
env->thumb = entry & 1;
|
env->thumb = entry & 1;
|
||||||
} else {
|
} else {
|
||||||
/* Raw binary image. Assume it is a Limux zImage. */
|
/* Raw binary image. Assume it is a Linux zImage. */
|
||||||
kernel_size = load_image(kernel_filename,
|
kernel_size = load_image(kernel_filename,
|
||||||
phys_ram_base + KERNEL_LOAD_ADDR);
|
phys_ram_base + KERNEL_LOAD_ADDR);
|
||||||
if (kernel_size < 0) {
|
if (kernel_size < 0) {
|
||||||
|
Loading…
Reference in New Issue
Block a user