[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 19/86] arm:integratorcp: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH 19/86] arm:integratorcp: use memdev for RAM |
Date: |
Tue, 31 Dec 2019 14:03:03 +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>
---
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 5249708..89c223b 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 08/86] alpha:dp264: use memdev for RAM, (continued)
- [PATCH 08/86] alpha:dp264: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 09/86] arm:aspeed: convert valid RAM sizes to data, Igor Mammedov, 2019/12/31
- [PATCH 10/86] arm:aspeed: actually check RAM size, Igor Mammedov, 2019/12/31
- [PATCH 12/86] arm:aspeed: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 15/86] arm:digic_boards: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 16/86] arm:highbank: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 18/86] arm:imx25_pdk: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 22/86] arm:mcimx6ul-evk: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 24/86] arm:mps2-tz: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 19/86] arm:integratorcp: use memdev for RAM,
Igor Mammedov <=
- [PATCH 20/86] arm:kzm: drop RAM size fixup, Igor Mammedov, 2019/12/31
- [PATCH 25/86] arm:mps2: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 14/86] arm:cubieboard: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 26/86] arm:musicpal: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 21/86] arm:kzm: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 29/86] arm:palm: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 27/86] arm:nseries: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 23/86] arm:mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 28/86] arm:omap_sx1: use memdev for RAM, Igor Mammedov, 2019/12/31