From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L3HnP-0001cS-8b for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:14:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L3HnO-0001bl-1x for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:14:42 -0500 Received: from [199.232.76.173] (port=37804 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L3HnN-0001bZ-TY for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:14:41 -0500 Received: from savannah.gnu.org ([199.232.41.3]:38357 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 1L3HnN-0007Lx-Pv for qemu-devel@nongnu.org; Thu, 20 Nov 2008 17:14:41 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L3HnM-0003WA-Rm for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:14:41 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L3HnM-0003W6-Ct for qemu-devel@nongnu.org; Thu, 20 Nov 2008 22:14:40 +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:14:40 +0000 Subject: [Qemu-devel] [5764] uImage: rename load_uboot() to load_uimage() (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: 5764 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5764 Author: aliguori Date: 2008-11-20 22:14:40 +0000 (Thu, 20 Nov 2008) Log Message: ----------- uImage: rename load_uboot() to load_uimage() (Hollis Blanchard) u-boot is a firmware. uImage is an executable file format. 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:11:52 UTC (rev 5763) +++ trunk/hw/an5206.c 2008-11-20 22:14:40 UTC (rev 5764) @@ -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, NULL); + kernel_size = load_uimage(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:11:52 UTC (rev 5763) +++ trunk/hw/arm_boot.c 2008-11-20 22:14:40 UTC (rev 5764) @@ -205,8 +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, NULL, - &is_linux); + kernel_size = load_uimage(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:11:52 UTC (rev 5763) +++ trunk/hw/dummy_m68k.c 2008-11-20 22:14:40 UTC (rev 5764) @@ -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, NULL); + kernel_size = load_uimage(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:11:52 UTC (rev 5763) +++ trunk/hw/mcf5208.c 2008-11-20 22:14:40 UTC (rev 5764) @@ -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, NULL); + kernel_size = load_uimage(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:11:52 UTC (rev 5763) +++ trunk/loader.c 2008-11-20 22:14:40 UTC (rev 5764) @@ -456,8 +456,8 @@ } /* Load a U-Boot image. */ -int load_uboot(const char *filename, target_ulong *ep, target_ulong *loadaddr, - int *is_linux) +int load_uimage(const char *filename, target_ulong *ep, target_ulong *loadaddr, + int *is_linux) { int fd; int size; Modified: trunk/sysemu.h =================================================================== --- trunk/sysemu.h 2008-11-20 22:11:52 UTC (rev 5763) +++ trunk/sysemu.h 2008-11-20 22:14:40 UTC (rev 5764) @@ -165,8 +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, target_ulong *loadaddr, - int *is_linux); +int load_uimage(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);