[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 37/41] hw/arm/mps2: Use the IEC binary prefix definitions
From: |
Peter Maydell |
Subject: |
[PULL 37/41] hw/arm/mps2: Use the IEC binary prefix definitions |
Date: |
Tue, 22 Oct 2019 14:31:30 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
IEC binary prefixes ease code review: the unit is explicit.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/mps2-tz.c | 3 ++-
hw/arm/mps2.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 6b24aaacded..f8b620bcc65 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -38,6 +38,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/arm/boot.h"
@@ -458,7 +459,7 @@ static void mps2tz_common_init(MachineState *machine)
* call the 16MB our "system memory", as it's the largest lump.
*/
memory_region_allocate_system_memory(&mms->psram,
- NULL, "mps.ram", 0x01000000);
+ NULL, "mps.ram", 16 * MiB);
memory_region_add_subregion(system_memory, 0x80000000, &mms->psram);
/* The overflow IRQs for all UARTs are ORed together.
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 10efff36b23..d002b126d39 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/arm/boot.h"
@@ -146,7 +147,7 @@ static void mps2_common_init(MachineState *machine)
* zbt_boot_ctrl is always zero).
*/
memory_region_allocate_system_memory(&mms->psram,
- NULL, "mps.ram", 0x1000000);
+ NULL, "mps.ram", 16 * MiB);
memory_region_add_subregion(system_memory, 0x21000000, &mms->psram);
switch (mmc->fpga_type) {
--
2.20.1
- [PULL 27/41] target/arm: Rebuild hflags at MSR writes, (continued)
- [PULL 27/41] target/arm: Rebuild hflags at MSR writes, Peter Maydell, 2019/10/22
- [PULL 28/41] target/arm: Rebuild hflags at CPSR writes, Peter Maydell, 2019/10/22
- [PULL 29/41] target/arm: Rebuild hflags at Xscale SCTLR writes, Peter Maydell, 2019/10/22
- [PULL 30/41] target/arm: Rebuild hflags for M-profile, Peter Maydell, 2019/10/22
- [PULL 31/41] target/arm: Rebuild hflags for M-profile NVIC, Peter Maydell, 2019/10/22
- [PULL 32/41] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state, Peter Maydell, 2019/10/22
- [PULL 33/41] hw/sd/sdhci: Add a comment to distinct the i.MX eSDHC functions, Peter Maydell, 2019/10/22
- [PULL 34/41] hw/sd/sdhci: Add dummy Samsung SDHCI controller, Peter Maydell, 2019/10/22
- [PULL 35/41] hw/arm/exynos4210: Use the Samsung s3c SDHCI controller, Peter Maydell, 2019/10/22
- [PULL 36/41] hw/arm/xilinx_zynq: Use the IEC binary prefix definitions, Peter Maydell, 2019/10/22
- [PULL 37/41] hw/arm/mps2: Use the IEC binary prefix definitions,
Peter Maydell <=
- [PULL 38/41] hw/arm/collie: Create the RAM in the board, Peter Maydell, 2019/10/22
- [PULL 39/41] hw/arm/omap2: Create the RAM in the board, Peter Maydell, 2019/10/22
- [PULL 41/41] hw/arm/digic4: Inline digic4_board_setup_ram() function, Peter Maydell, 2019/10/22
- [PULL 40/41] hw/arm/omap1: Create the RAM in the board, Peter Maydell, 2019/10/22