diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-07-20 13:34:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-07-20 13:34:50 +0100 |
| commit | 0b94438480c8f52cc9e22b1038e6ba5096245c4e (patch) | |
| tree | 5db8300d145779ee1bd827d5f4ce7f0141937193 | |
| parent | de841dea59168e4abb8a2d09aaa30cc217fefda3 (diff) | |
hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct
Clean up the mix of getting the RAM size from the global ram_size
and from the ram_size field in the arm_boot_info structure, so
that we always use the structure field.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
| -rw-r--r-- | hw/arm_boot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c index a1e6ddbc1c..29ae324f96 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -357,7 +357,7 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) if (kernel_size < 0) { entry = info->loader_start + KERNEL_LOAD_ADDR; kernel_size = load_image_targphys(info->kernel_filename, entry, - ram_size - KERNEL_LOAD_ADDR); + info->ram_size - KERNEL_LOAD_ADDR); is_linux = 1; } if (kernel_size < 0) { @@ -371,7 +371,8 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info) initrd_size = load_image_targphys(info->initrd_filename, info->loader_start + INITRD_LOAD_ADDR, - ram_size - INITRD_LOAD_ADDR); + info->ram_size + - INITRD_LOAD_ADDR); if (initrd_size < 0) { fprintf(stderr, "qemu: could not load initrd '%s'\n", info->initrd_filename); |