ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

microblaze: do not use ram_size global 

Use the equivalent argument to the function instead.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-28 06:20:01 -04:00
parent 5601d24164
commit 89ee4a098c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/microblaze/boot.c
View File

@ -170,7 +170,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
/* Not an ELF image nor an u-boot image, try a RAW image. */ /* Not an ELF image nor an u-boot image, try a RAW image. */
if (kernel_size < 0) { if (kernel_size < 0) {
kernel_size = load_image_targphys(kernel_filename, ddr_base, kernel_size = load_image_targphys(kernel_filename, ddr_base,
ram_size); ramsize);
boot_info.bootstrap_pc = ddr_base; boot_info.bootstrap_pc = ddr_base;
high = (ddr_base + kernel_size + 3) & ~3; high = (ddr_base + kernel_size + 3) & ~3;
} }
@ -185,11 +185,11 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
initrd_size = load_ramdisk(initrd_filename, initrd_size = load_ramdisk(initrd_filename,
boot_info.initrd_start, boot_info.initrd_start,
ram_size - initrd_offset); ramsize - initrd_offset);
if (initrd_size < 0) { if (initrd_size < 0) {
initrd_size = load_image_targphys(initrd_filename, initrd_size = load_image_targphys(initrd_filename,
boot_info.initrd_start, boot_info.initrd_start,
ram_size - initrd_offset); ramsize - initrd_offset);
} }
if (initrd_size < 0) { if (initrd_size < 0) {
error_report("could not load initrd '%s'", error_report("could not load initrd '%s'",
@ -206,7 +206,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
} }
/* Provide a device-tree. */ /* Provide a device-tree. */
boot_info.fdt = boot_info.cmdline + 4096; boot_info.fdt = boot_info.cmdline + 4096;
microblaze_load_dtb(boot_info.fdt, ram_size, microblaze_load_dtb(boot_info.fdt, ramsize,
boot_info.initrd_start, boot_info.initrd_start,
boot_info.initrd_end, boot_info.initrd_end,
kernel_cmdline, kernel_cmdline,