summaryrefslogtreecommitdiff
path: root/hw/an5206.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-20 22:11:52 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-20 22:11:52 +0000
commit55147d488dfa480851b48c1e4b5509fa4c874c15 (patch)
treeb5e3ab5e1bc76d3ee5fddbd8566d8496f1b23e8d /hw/an5206.c
parent612d9e7995665397bd59d2b3db461c07849b738a (diff)
downloadqemu-55147d488dfa480851b48c1e4b5509fa4c874c15.tar.gz
qemu-55147d488dfa480851b48c1e4b5509fa4c874c15.tar.bz2
qemu-55147d488dfa480851b48c1e4b5509fa4c874c15.zip
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 <hollisb@us.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5763 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/an5206.c')
-rw-r--r--hw/an5206.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/an5206.c b/hw/an5206.c
index 9d315f3aa4..bb9cde10a5 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -68,7 +68,7 @@ static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
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,