[Xen-changelog] [xen-unstable] arm: remove the hack for loading vmlinux images

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User David Vrabel <david.vrabel@xxxxxxxxxx>
# Date 1332426406 0
# Node ID eb3b8574d4047f6f76cd41ed6357654e413a4053
# Parent  eb2dc06f68e69f87d5e018349c3c239fcc59753f
arm: remove the hack for loading vmlinux images

Don't adjust the RAM location/size when loading an ELF for dom0.  It
was vmlinux specific and no longer needed because Linux can be loaded
from a zImage.  Support for loading ELF images is not removed as it
may be useful for loading things other than the Linux kernel.

This also makes preparing the device tree for dom0 easier.

Signed-off-by: David Vrabel <david.vrabel@xxxxxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r eb2dc06f68e6 -r eb3b8574d404 xen/arch/arm/kernel.c
--- a/xen/arch/arm/kernel.c     Thu Mar 22 14:26:46 2012 +0000
+++ b/xen/arch/arm/kernel.c     Thu Mar 22 14:26:46 2012 +0000
@@ -91,7 +91,6 @@
 
 /**
  * Check the image is a zImage and return the load address and length
- * (FIXME: including any appended DTB).
  */
 static int kernel_try_zimage_prepare(struct kernel_info *info)
 {
@@ -117,8 +116,6 @@
         end += be32_to_cpu(dtb_hdr.total_size);
     }
 
-    /* FIXME: get RAM location from appended DTB (if there is one)? */
-
     /*
      * If start is zero, the zImage is position independent -- load it
      * at 32k from start of RAM.
@@ -166,13 +163,9 @@
         return rc;
 
     /*
-     * FIXME: can the ELF header be used to find the physical address
-     * to load the image to?  Instead of making virt == phys by
-     * relocating the guest's RAM.
+     * TODO: can the ELF header be used to find the physical address
+     * to load the image to?  Instead of assuming virt == phys.
      */
-    info->ram_start = 0xc0000000;
-    info->ram_end   = 0xc8000000;
-
     info->entry = info->elf.parms.virt_entry;
     info->load = kernel_elf_load;
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog