From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3Hkg-0000Ds-55 for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:11:54 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3Hkf-0000Dd-SY for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:11:53 -0500 Received: from [199.232.76.173] (port=53298 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3Hkf-0000Da-JT for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:11:53 -0500 Received: from savannah.gnu.org ([199.232.41.3]:38318 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1L3Hkf-00079E-Bp for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:11:53 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L3Hke-0003S7-Rx for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:11:52 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L3Hke-0003S2-Ip for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:11:52 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Thu, 20 Nov 2008 22:11:52 +0000 Subject: [Qemu-devel] [5763] uImage: return base load address (Hollis Blanchard) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5763 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5763 Author: aliguori Date: 2008-11-20 22:11:52 +0000 (Thu, 20 Nov 2008) Log Message: ----------- uImage: return base load address (Hollis Blanchard) Return the base address at which the image was loaded so that callers may keep track of currently occupied guest memory. This will be required by the PPC 440 embedded code to avoid hard coding a device model/initrd location. Other users of this function could make use of this parameter to avoid hard coding these locations in the future too. Signed-off-by: Hollis Blanchard Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/hw/an5206.c trunk/hw/arm_boot.c trunk/hw/dummy_m68k.c trunk/hw/mcf5208.c trunk/loader.c trunk/sysemu.h Modified: trunk/hw/an5206.c =================================================================== --- trunk/hw/an5206.c 2008-11-20 22:04:01 UTC (rev 5762) +++ trunk/hw/an5206.c 2008-11-20 22:11:52 UTC (rev 5763) @@ -68,7 +68,7 @@ kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL); entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uboot(kernel_filename, &entry, NULL); + kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL); } if (kernel_size < 0) { kernel_size = load_image(kernel_filename, Modified: trunk/hw/arm_boot.c =================================================================== --- trunk/hw/arm_boot.c 2008-11-20 22:04:01 UTC (rev 5762) +++ trunk/hw/arm_boot.c 2008-11-20 22:11:52 UTC (rev 5763) @@ -205,7 +205,8 @@ kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL); entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uboot(info->kernel_filename, &entry, &is_linux); + kernel_size = load_uboot(info->kernel_filename, &entry, NULL, + &is_linux); } if (kernel_size < 0) { kernel_size = load_image(info->kernel_filename, Modified: trunk/hw/dummy_m68k.c =================================================================== --- trunk/hw/dummy_m68k.c 2008-11-20 22:04:01 UTC (rev 5762) +++ trunk/hw/dummy_m68k.c 2008-11-20 22:11:52 UTC (rev 5763) @@ -44,7 +44,7 @@ kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL); entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uboot(kernel_filename, &entry, NULL); + kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL); } if (kernel_size < 0) { kernel_size = load_image(kernel_filename, Modified: trunk/hw/mcf5208.c =================================================================== --- trunk/hw/mcf5208.c 2008-11-20 22:04:01 UTC (rev 5762) +++ trunk/hw/mcf5208.c 2008-11-20 22:11:52 UTC (rev 5763) @@ -290,7 +290,7 @@ kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL); entry = elf_entry; if (kernel_size < 0) { - kernel_size = load_uboot(kernel_filename, &entry, NULL); + kernel_size = load_uboot(kernel_filename, &entry, NULL, NULL); } if (kernel_size < 0) { kernel_size = load_image(kernel_filename, phys_ram_base); Modified: trunk/loader.c =================================================================== --- trunk/loader.c 2008-11-20 22:04:01 UTC (rev 5762) +++ trunk/loader.c 2008-11-20 22:11:52 UTC (rev 5763) @@ -456,7 +456,8 @@ } /* Load a U-Boot image. */ -int load_uboot(const char *filename, target_ulong *ep, int *is_linux) +int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr, + int *is_linux) { int fd; int size; @@ -533,6 +534,9 @@ cpu_physical_memory_write_rom(hdr->ih_load, data, hdr->ih_size); + if (loadaddr) + *loadaddr = hdr->ih_load; + ret = hdr->ih_size; out: Modified: trunk/sysemu.h =================================================================== --- trunk/sysemu.h 2008-11-20 22:04:01 UTC (rev 5762) +++ trunk/sysemu.h 2008-11-20 22:11:52 UTC (rev 5763) @@ -165,7 +165,8 @@ int load_elf(const char *filename, int64_t address_offset, uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr); int load_aout(const char *filename, target_phys_addr_t addr, int max_sz); -int load_uboot(const char *filename, target_ulong *ep, int *is_linux); +int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr, + int *is_linux); int fread_targphys(target_phys_addr_t dst_addr, size_t nbytes, FILE *f); int fread_targphys_ok(target_phys_addr_t dst_addr, size_t nbytes, FILE *f);