[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH REPOST v3 59/80] ppc/mac_newworld: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH REPOST v3 59/80] ppc/mac_newworld: use memdev for RAM |
Date: |
Thu, 23 Jan 2020 12:38:24 +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>
Acked-by: David Gibson <address@hidden>
Acked-by: Mark Cave-Ayland <address@hidden>
---
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/ppc/mac_newworld.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 3594517..2546d33 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -118,7 +118,7 @@ static void ppc_core99_init(MachineState *machine)
char *filename;
IrqLines *openpic_irqs;
int linux_boot, i, j, k;
- MemoryRegion *ram = g_new(MemoryRegion, 1), *bios = g_new(MemoryRegion, 1);
+ MemoryRegion *bios = g_new(MemoryRegion, 1);
hwaddr kernel_base, initrd_base, cmdline_base = 0;
long kernel_size, initrd_size;
UNINHostState *uninorth_pci;
@@ -152,8 +152,7 @@ static void ppc_core99_init(MachineState *machine)
}
/* allocate RAM */
- memory_region_allocate_system_memory(ram, NULL, "ppc_core99.ram",
ram_size);
- memory_region_add_subregion(get_system_memory(), 0, ram);
+ memory_region_add_subregion(get_system_memory(), 0, machine->ram);
/* allocate and load BIOS */
memory_region_init_ram(bios, NULL, "ppc_core99.bios", BIOS_SIZE,
@@ -586,6 +585,7 @@ static void core99_machine_class_init(ObjectClass *oc, void
*data)
#else
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("7400_v2.9");
#endif
+ mc->default_ram_id = "ppc_core99.ram";
mc->ignore_boot_device_suffixes = true;
fwc->get_dev_path = core99_fw_dev_path;
}
--
2.7.4
- [PATCH REPOST v3 52/80] mips/mips_fulong2e: use memdev for RAM, (continued)
- [PATCH REPOST v3 52/80] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 54/80] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 55/80] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 56/80] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 57/80] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 58/80] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 60/80] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 59/80] ppc/mac_newworld: use memdev for RAM,
Igor Mammedov <=
- [PATCH REPOST v3 63/80] ppc/ppc405_boards: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 61/80] ppc/pnv: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 62/80] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 65/80] ppc/{ppc440_bamboo, sam460ex}: use memdev for RAM, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 68/80] ppc/virtex_ml507: remove unused arguments, Igor Mammedov, 2020/01/23
- [PATCH REPOST v3 64/80] ppc/{ppc440_bamboo, sam460ex}: drop RAM size fixup, Igor Mammedov, 2020/01/23