summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-01-17 08:59:26 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-01-17 08:59:26 +0000
commit72742c8626a9a25dd707a4c76583cd9c9faa5942 (patch)
treea7d6dd4ad5dca36203153a51dde5e1eb8cc4dd8d /hw
parentadb4796796a073d782d0be3566f91e2489dc7065 (diff)
downloadqemu-72742c8626a9a25dd707a4c76583cd9c9faa5942.tar.gz
ARM boot fix (Jason Wessel).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2323 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/arm_boot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index f62f0f6fab..28f6a92622 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -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) {