[Qemu-devel] [5515] ETRAX-FS: Correct booting of elf linux images from ram.

[Edgar E. Iglesias]

Revision: 5515
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5515
Author:   edgar_igl
Date:     2008-10-22 19:35:08 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
ETRAX-FS: Correct booting of elf linux images from ram.

Modified Paths:
--------------
    trunk/hw/etraxfs.c

Modified: trunk/hw/etraxfs.c
===================================================================
--- trunk/hw/etraxfs.c  2008-10-22 19:22:30 UTC (rev 5514)
+++ trunk/hw/etraxfs.c  2008-10-22 19:35:08 UTC (rev 5515)
@@ -122,17 +122,16 @@
         uint64_t entry;
         /* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis 
            devboard SDK.  */
-        kernel_size = load_elf(kernel_filename, 0,
+        kernel_size = load_elf(kernel_filename, -0x80000000LL,
                                &entry, NULL, NULL);
         bootstrap_pc = entry;
         if (kernel_size < 0) {
             /* Takes a kimage from the axis devboard SDK.  */
             kernel_size = load_image(kernel_filename, phys_ram_base + 0x4000);
             bootstrap_pc = 0x40004000;
-            /* magic for boot.  */
-            env->regs[8] = 0x56902387;
             env->regs[9] = 0x40004000 + kernel_size;
         }
+        env->regs[8] = 0x56902387; /* RAM init magic.  */
     }
     env->pc = bootstrap_pc;