mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
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
This commit is contained in:
parent
5a1235779e
commit
21cafd08a6
6 changed files with 12 additions and 6 deletions
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -44,7 +44,7 @@ static void dummy_m68k_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,
|
||||
|
|
|
@ -290,7 +290,7 @@ static void mcf5208evb_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, phys_ram_base);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue