[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/86] arm:collie: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH 13/86] arm:collie: use memdev for RAM |
Date: |
Tue, 31 Dec 2019 14:02:57 +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.
PS:
while at it add check for user supplied RAM size and error
out if it mismatches board expected value.
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/arm/collie.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 970a440..a67bb1f 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -20,20 +20,23 @@
static struct arm_boot_info collie_binfo = {
.loader_start = SA_SDCS0,
- .ram_size = 0x20000000,
};
static void collie_init(MachineState *machine)
{
StrongARMState *s;
DriveInfo *dinfo;
- MemoryRegion *sdram = g_new(MemoryRegion, 1);
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
+
+ if (machine->ram_size != mc->default_ram_size) {
+ error_report("Invalid RAM size, should be %" PRIi64 " Bytes",
+ mc->default_ram_size);
+ exit(EXIT_FAILURE);
+ }
s = sa1110_init(machine->cpu_type);
- memory_region_allocate_system_memory(sdram, NULL, "strongarm.sdram",
- collie_binfo.ram_size);
- memory_region_add_subregion(get_system_memory(), SA_SDCS0, sdram);
+ memory_region_add_subregion(get_system_memory(), SA_SDCS0, machine->ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000,
@@ -57,6 +60,8 @@ static void collie_machine_init(MachineClass *mc)
mc->init = collie_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");
+ mc->default_ram_size = 0x20000000;
+ mc->default_ram_id = "strongarm.sdram";
}
DEFINE_MACHINE("collie", collie_machine_init)
--
2.7.4
- [PATCH 19/86] arm:integratorcp: use memdev for RAM, (continued)
- [PATCH 19/86] arm:integratorcp: use memdev for RAM, Igor Mammedov, 2019/12/31
- [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
- [PATCH 13/86] arm:collie: use memdev for RAM,
Igor Mammedov <=
- [PATCH 32/86] arm:sbsa-ref: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 33/86] arm:versatilepb: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 30/86] arm:raspi: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 37/86] arm:xilinx_zynq: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 42/86] cris:axis_dev88: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 31/86] arm:sabrelite: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 35/86] arm:virt: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 41/86] null-machine: use memdev for RAM, Igor Mammedov, 2019/12/31
- [PATCH 36/86] arm:xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2019/12/31