[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 21/86] arm:kzm: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH 21/86] arm:kzm: use memdev for RAM |
Date: |
Tue, 31 Dec 2019 14:03:05 +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/kzm.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 27800c5..f63902e 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -51,7 +51,6 @@
typedef struct IMX31KZM {
FslIMX31State soc;
- MemoryRegion ram;
MemoryRegion ram_alias;
} IMX31KZM;
@@ -84,10 +83,8 @@ static void kzm_init(MachineState *machine)
exit(EXIT_FAILURE);
}
- memory_region_allocate_system_memory(&s->ram, NULL, "kzm.ram",
- machine->ram_size);
memory_region_add_subregion(get_system_memory(), FSL_IMX31_SDRAM0_ADDR,
- &s->ram);
+ machine->ram);
/* initialize the alias memory if any */
for (i = 0, ram_size = machine->ram_size, alias_offset = 0;
@@ -107,7 +104,8 @@ static void kzm_init(MachineState *machine)
if (size < ram[i].size) {
memory_region_init_alias(&s->ram_alias, NULL, "ram.alias",
- &s->ram, alias_offset, ram[i].size -
size);
+ machine->ram,
+ alias_offset, ram[i].size - size);
memory_region_add_subregion(get_system_memory(),
ram[i].addr + size, &s->ram_alias);
}
@@ -139,6 +137,7 @@ static void kzm_machine_init(MachineClass *mc)
mc->desc = "ARM KZM Emulation Baseboard (ARM1136)";
mc->init = kzm_init;
mc->ignore_memory_transaction_failures = true;
+ mc->default_ram_id = "kzm.ram";
}
DEFINE_MACHINE("kzm", kzm_machine_init)
--
2.7.4
- [PATCH 15/86] arm:digic_boards: use memdev for RAM, (continued)
- [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, 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 <=
- [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, 2019/12/31
- [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