[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 17/80] arm/integratorcp: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v4 17/80] arm/integratorcp: use memdev for RAM |
Date: |
Fri, 31 Jan 2020 16:08:47 +0100 |
memory_region_allocate_system_memory() API is going away, so
replace it with memdev allocated MemoryRegion. The later is
initialized by generic code, so board only needs to opt in
to memdev scheme by providing
MachineClass::default_ram_id
and using MachineState::ram instead of manually initializing
RAM memory region.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
---
CC: address@hidden
---
hw/arm/integratorcp.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 0cd94d9..cc845b8 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -585,7 +585,6 @@ static void integratorcp_init(MachineState *machine)
Object *cpuobj;
ARMCPU *cpu;
MemoryRegion *address_space_mem = get_system_memory();
- MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *ram_alias = g_new(MemoryRegion, 1);
qemu_irq pic[32];
DeviceState *dev, *sic, *icp;
@@ -605,14 +604,13 @@ static void integratorcp_init(MachineState *machine)
cpu = ARM_CPU(cpuobj);
- memory_region_allocate_system_memory(ram, NULL, "integrator.ram",
- ram_size);
/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */
/* ??? RAM should repeat to fill physical memory space. */
/* SDRAM at address zero*/
- memory_region_add_subregion(address_space_mem, 0, ram);
+ memory_region_add_subregion(address_space_mem, 0, machine->ram);
/* And again at address 0x80000000 */
- memory_region_init_alias(ram_alias, NULL, "ram.alias", ram, 0, ram_size);
+ memory_region_init_alias(ram_alias, NULL, "ram.alias", machine->ram,
+ 0, ram_size);
memory_region_add_subregion(address_space_mem, 0x80000000, ram_alias);
dev = qdev_create(NULL, TYPE_INTEGRATOR_CM);
@@ -660,6 +658,7 @@ static void integratorcp_machine_init(MachineClass *mc)
mc->init = integratorcp_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
+ mc->default_ram_id = "integrator.ram";
}
DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
--
2.7.4
- [PATCH v4 14/80] arm/highbank: use memdev for RAM, (continued)
- [PATCH v4 14/80] arm/highbank: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 09/80] arm/aspeed: actually check RAM size, Igor Mammedov, 2020/01/31
- [PATCH v4 13/80] arm/digic_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 12/80] arm/cubieboard: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 03/80] machine: alias -mem-path and -mem-prealloc into memory-foo backend, Igor Mammedov, 2020/01/31
- [PATCH v4 19/80] arm/kzm: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 16/80] arm/imx25_pdk: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 15/80] arm/imx25_pdk: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 23/80] arm/mps2: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 18/80] arm/kzm: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 17/80] arm/integratorcp: use memdev for RAM,
Igor Mammedov <=
- [PATCH v4 20/80] arm/mcimx6ul-evk: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 25/80] arm/nseries: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 26/80] arm/omap_sx1: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 27/80] arm/palm: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 21/80] arm/mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 24/80] arm/musicpal: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 28/80] arm/raspi: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 29/80] arm/sabrelite: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 22/80] arm/mps2-tz: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 32/80] arm/vexpress: use memdev for RAM, Igor Mammedov, 2020/01/31