hw/nios2: Use the IEC binary prefix definitions
It eases code review, unit is explicit. Patch generated using: $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/ and modified manually. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20180625124238.25339-26-f4bug@amsat.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a4fb331dab
commit
a3c81ef934
@ -29,6 +29,7 @@
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qemu-common.h"
|
||||
#include "cpu.h"
|
||||
#include "qemu/option.h"
|
||||
@ -38,7 +39,6 @@
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "hw/loader.h"
|
||||
#include "elf.h"
|
||||
#include "qemu/cutils.h"
|
||||
|
||||
#include "boot.h"
|
||||
|
||||
@ -177,7 +177,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
|
||||
high = ddr_base + kernel_size;
|
||||
}
|
||||
|
||||
high = ROUND_UP(high, 1024 * 1024);
|
||||
high = ROUND_UP(high, 1 * MiB);
|
||||
|
||||
/* If initrd is available, it goes after the kernel, aligned to 1M. */
|
||||
if (initrd_filename) {
|
||||
@ -213,7 +213,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
|
||||
high += fdt_size;
|
||||
|
||||
/* Kernel command is at the end, 4k aligned. */
|
||||
boot_info.cmdline = ROUND_UP(high, 4096);
|
||||
boot_info.cmdline = ROUND_UP(high, 4 * KiB);
|
||||
if (kernel_cmdline && strlen(kernel_cmdline)) {
|
||||
pstrcpy_targphys("cmdline", boot_info.cmdline, 256, kernel_cmdline);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user