[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH REPOST v3 10/80] arm/cubieboard: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH REPOST v3 10/80] arm/cubieboard: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 12:37:35 +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, get rid of no longer needed CubieBoardState wrapper.
Signed-off-by: Igor Mammedov <address@hidden>
---
CC: address@hidden
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/arm/cubieboard.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 6dc2f1d..089f9a3 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -28,52 +28,42 @@ static struct arm_boot_info cubieboard_binfo = {
.board_id = 0x1008,
};
-typedef struct CubieBoardState {
- AwA10State *a10;
- MemoryRegion sdram;
-} CubieBoardState;
-
static void cubieboard_init(MachineState *machine)
{
- CubieBoardState *s = g_new(CubieBoardState, 1);
+ AwA10State *a10 = AW_A10(object_new(TYPE_AW_A10));
Error *err = NULL;
- s->a10 = AW_A10(object_new(TYPE_AW_A10));
-
- object_property_set_int(OBJECT(&s->a10->emac), 1, "phy-addr", &err);
+ object_property_set_int(OBJECT(&a10->emac), 1, "phy-addr", &err);
if (err != NULL) {
error_reportf_err(err, "Couldn't set phy address: ");
exit(1);
}
- object_property_set_int(OBJECT(&s->a10->timer), 32768, "clk0-freq", &err);
+ object_property_set_int(OBJECT(&a10->timer), 32768, "clk0-freq", &err);
if (err != NULL) {
error_reportf_err(err, "Couldn't set clk0 frequency: ");
exit(1);
}
- object_property_set_int(OBJECT(&s->a10->timer), 24000000, "clk1-freq",
- &err);
+ object_property_set_int(OBJECT(&a10->timer), 24000000, "clk1-freq", &err);
if (err != NULL) {
error_reportf_err(err, "Couldn't set clk1 frequency: ");
exit(1);
}
- object_property_set_bool(OBJECT(s->a10), true, "realized", &err);
+ object_property_set_bool(OBJECT(a10), true, "realized", &err);
if (err != NULL) {
error_reportf_err(err, "Couldn't realize Allwinner A10: ");
exit(1);
}
- memory_region_allocate_system_memory(&s->sdram, NULL, "cubieboard.ram",
- machine->ram_size);
memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE,
- &s->sdram);
+ machine->ram);
/* TODO create and connect IDE devices for ide_drive_get() */
cubieboard_binfo.ram_size = machine->ram_size;
- arm_load_kernel(&s->a10->cpu, machine, &cubieboard_binfo);
+ arm_load_kernel(&a10->cpu, machine, &cubieboard_binfo);
}
static void cubieboard_machine_init(MachineClass *mc)
@@ -84,6 +74,7 @@ static void cubieboard_machine_init(MachineClass *mc)
mc->block_default_type = IF_IDE;
mc->units_per_default_bus = 1;
mc->ignore_memory_transaction_failures = true;
+ mc->default_ram_id = "cubieboard.ram";
}
DEFINE_MACHINE("cubieboard", cubieboard_machine_init)
--
2.7.4
- [PATCH REPOST v3 00/80] refactor main RAM allocation to use hostmem backend, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 02/80] machine: introduce memory-backend property, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 01/80] numa: remove deprecated -mem-path fallback to anonymous RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 03/80] machine: alias -mem-path and -mem-prealloc into memory-foo backend, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 04/80] machine: introduce convenience MachineState::ram, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 05/80] initialize MachineState::ram in NUMA case, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 06/80] alpha:dp264: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 10/80] arm/cubieboard: use memdev for RAM,
Igor Mammedov <=
- [PATCH REPOST v3 07/80] arm/aspeed: actually check RAM size, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 09/80] arm/collie: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 08/80] arm/aspeed: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 11/80] arm/digic_boards: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 12/80] arm/highbank: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 14/80] arm/imx25_pdk: use memdev for RAM, Igor Mammedov, 2020/01/23