[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 40/79] cris/axis_dev88: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v6 40/79] cris/axis_dev88: use memdev for RAM |
Date: |
Wed, 19 Feb 2020 11:09:14 -0500 |
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: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
CC: address@hidden
---
hw/cris/axis_dev88.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index be7760476a..cf6790fd6f 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -249,7 +249,6 @@ static struct cris_load_info li;
static
void axisdev88_init(MachineState *machine)
{
- ram_addr_t ram_size = machine->ram_size;
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
CRISCPU *cpu;
@@ -261,16 +260,12 @@ void axisdev88_init(MachineState *machine)
struct etraxfs_dma_client *dma_eth;
int i;
MemoryRegion *address_space_mem = get_system_memory();
- MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
MemoryRegion *phys_intmem = g_new(MemoryRegion, 1);
/* init CPUs */
cpu = CRIS_CPU(cpu_create(machine->cpu_type));
- /* allocate RAM */
- memory_region_allocate_system_memory(phys_ram, NULL, "axisdev88.ram",
- ram_size);
- memory_region_add_subregion(address_space_mem, 0x40000000, phys_ram);
+ memory_region_add_subregion(address_space_mem, 0x40000000, machine->ram);
/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
internal memory. */
@@ -351,6 +346,7 @@ static void axisdev88_machine_init(MachineClass *mc)
mc->init = axisdev88_init;
mc->is_default = 1;
mc->default_cpu_type = CRIS_CPU_TYPE_NAME("crisv32");
+ mc->default_ram_id = "axisdev88.ram";
}
DEFINE_MACHINE("axis-dev88", axisdev88_machine_init)
--
2.18.1
- [PATCH v6 33/79] arm/virt: use memdev for RAM, (continued)
- [PATCH v6 33/79] arm/virt: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 32/79] arm/vexpress: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 35/79] arm/xilinx_zynq: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 34/79] arm/xilinx_zynq: drop RAM size fixup, Igor Mammedov, 2020/02/19
- [PATCH v6 39/79] null-machine: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 30/79] arm/sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 36/79] arm/xlnx-versal-virt: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 38/79] s390x/s390-virtio-ccw: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 11/79] arm/collie: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 37/79] arm/xlnx-zcu102: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 40/79] cris/axis_dev88: use memdev for RAM,
Igor Mammedov <=
- [PATCH v6 42/79] x86/microvm: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 43/79] x86/pc: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 46/79] m68k/an5206: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 45/79] lm32/milkymist: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 44/79] lm32/lm32_boards: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 48/79] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 47/79] m68k/q800: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 41/79] hppa: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 50/79] mips/boston: use memdev for RAM, Igor Mammedov, 2020/02/19
- [PATCH v6 49/79] m68k/next-cube: use memdev for RAM, Igor Mammedov, 2020/02/19