openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
pbrook 2007-01-17 08:59:26 +00:00
parent adb4796796
commit 72742c8626
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm_boot.c
View File

@ -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);
if (kernel_size) {
if (kernel_size >= 0) {
/* An ELF image. Jump to the entry point. */
env->regs[15] = entry & 0xfffffffe;
env->thumb = entry & 1;
} 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,
phys_ram_base + KERNEL_LOAD_ADDR);
if (kernel_size < 0) {