| Message ID | 20180215042900.16078-16-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw: use the BYTE-based definitions when useful | expand |
On 02/15/2018 01:28 AM, Philippe Mathieu-Daudé wrote: > It ease code review, unit is explicit. Forgot to add: Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/lm32/lm32_boards.c | 12 ++++++------ > hw/lm32/milkymist.c | 8 ++++---- > 2 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c > index 527bcc229c..15315101be 100644 > --- a/hw/lm32/lm32_boards.c > +++ b/hw/lm32/lm32_boards.c > @@ -88,10 +88,10 @@ static void lm32_evr_init(MachineState *machine) > > /* memory map */ > hwaddr flash_base = 0x04000000; > - size_t flash_sector_size = 256 * 1024; > - size_t flash_size = 32 * 1024 * 1024; > + size_t flash_sector_size = 256 * K_BYTE; > + size_t flash_size = 32 * M_BYTE; > hwaddr ram_base = 0x08000000; > - size_t ram_size = 64 * 1024 * 1024; > + size_t ram_size = 64 * M_BYTE; > hwaddr timer0_base = 0x80002000; > hwaddr uart0_base = 0x80006000; > hwaddr timer1_base = 0x8000a000; > @@ -174,10 +174,10 @@ static void lm32_uclinux_init(MachineState *machine) > > /* memory map */ > hwaddr flash_base = 0x04000000; > - size_t flash_sector_size = 256 * 1024; > - size_t flash_size = 32 * 1024 * 1024; > + size_t flash_sector_size = 256 * K_BYTE; > + size_t flash_size = 32 * M_BYTE; > hwaddr ram_base = 0x08000000; > - size_t ram_size = 64 * 1024 * 1024; > + size_t ram_size = 64 * M_BYTE; > hwaddr uart0_base = 0x80000000; > hwaddr timer0_base = 0x80002000; > hwaddr timer1_base = 0x80010000; > diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c > index c28379399f..b884b825bc 100644 > --- a/hw/lm32/milkymist.c > +++ b/hw/lm32/milkymist.c > @@ -36,7 +36,7 @@ > > #define BIOS_FILENAME "mmone-bios.bin" > #define BIOS_OFFSET 0x00860000 > -#define BIOS_SIZE (512*1024) > +#define BIOS_SIZE (512 * K_BYTE) > #define KERNEL_LOAD_ADDR 0x40000000 > > typedef struct { > @@ -95,10 +95,10 @@ milkymist_init(MachineState *machine) > > /* memory map */ > hwaddr flash_base = 0x00000000; > - size_t flash_sector_size = 128 * 1024; > - size_t flash_size = 32 * 1024 * 1024; > + size_t flash_sector_size = 128 * K_BYTE; > + size_t flash_size = 32 * M_BYTE; > hwaddr sdram_base = 0x40000000; > - size_t sdram_size = 128 * 1024 * 1024; > + size_t sdram_size = 128 * M_BYTE; > > hwaddr initrd_base = sdram_base + 0x1002000; > hwaddr cmdline_base = sdram_base + 0x1000000; >
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 527bcc229c..15315101be 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -88,10 +88,10 @@ static void lm32_evr_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * M_BYTE; hwaddr timer0_base = 0x80002000; hwaddr uart0_base = 0x80006000; hwaddr timer1_base = 0x8000a000; @@ -174,10 +174,10 @@ static void lm32_uclinux_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x04000000; - size_t flash_sector_size = 256 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 256 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr ram_base = 0x08000000; - size_t ram_size = 64 * 1024 * 1024; + size_t ram_size = 64 * M_BYTE; hwaddr uart0_base = 0x80000000; hwaddr timer0_base = 0x80002000; hwaddr timer1_base = 0x80010000; diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index c28379399f..b884b825bc 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -36,7 +36,7 @@ #define BIOS_FILENAME "mmone-bios.bin" #define BIOS_OFFSET 0x00860000 -#define BIOS_SIZE (512*1024) +#define BIOS_SIZE (512 * K_BYTE) #define KERNEL_LOAD_ADDR 0x40000000 typedef struct { @@ -95,10 +95,10 @@ milkymist_init(MachineState *machine) /* memory map */ hwaddr flash_base = 0x00000000; - size_t flash_sector_size = 128 * 1024; - size_t flash_size = 32 * 1024 * 1024; + size_t flash_sector_size = 128 * K_BYTE; + size_t flash_size = 32 * M_BYTE; hwaddr sdram_base = 0x40000000; - size_t sdram_size = 128 * 1024 * 1024; + size_t sdram_size = 128 * M_BYTE; hwaddr initrd_base = sdram_base + 0x1002000; hwaddr cmdline_base = sdram_base + 0x1000000;