From 21cafd08a6a56f70a3d943df654d90c9d9e6f38a Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 20 Nov 2008 22:11:52 +0000 Subject: 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 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5763 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/arm_boot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/arm_boot.c') diff --git a/hw/arm_boot.c b/hw/arm_boot.c index 5990961781..765075d913 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -205,7 +205,8 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) 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, -- cgit v1.2.3