[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 27/86] arm:palm: use memdev for RAM
From: |
Igor Mammedov |
Subject: |
[PATCH v2 27/86] arm:palm: use memdev for RAM |
Date: |
Wed, 15 Jan 2020 16:06:42 +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>
---
v2:
* fix format string causing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/arm/palm.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 72eca8c..336ac4b 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -181,7 +181,6 @@ static void palmte_gpio_setup(struct omap_mpu_state_s *cpu)
static struct arm_boot_info palmte_binfo = {
.loader_start = OMAP_EMIFF_BASE,
- .ram_size = 0x02000000,
.board_id = 0x331,
};
@@ -195,15 +194,20 @@ static void palmte_init(MachineState *machine)
static uint32_t cs2val = 0x0000e1a0;
static uint32_t cs3val = 0xe1a0e1a0;
int rom_size, rom_loaded = 0;
- MemoryRegion *dram = g_new(MemoryRegion, 1);
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *cs = g_new(MemoryRegion, 4);
- memory_region_allocate_system_memory(dram, NULL, "omap1.dram",
- palmte_binfo.ram_size);
- memory_region_add_subregion(address_space_mem, OMAP_EMIFF_BASE, dram);
+ if (machine->ram_size != mc->default_ram_size) {
+ error_report("Invalid RAM size, should be " RAM_ADDR_UFMT " Bytes",
+ mc->default_ram_size);
+ exit(EXIT_FAILURE);
+ }
+
+ memory_region_add_subregion(address_space_mem, OMAP_EMIFF_BASE,
+ machine->ram);
- mpu = omap310_mpu_init(dram, machine->cpu_type);
+ mpu = omap310_mpu_init(machine->ram, machine->cpu_type);
/* External Flash (EMIFS) */
memory_region_init_ram(flash, NULL, "palmte.flash", flash_size,
@@ -265,6 +269,8 @@ static void palmte_machine_init(MachineClass *mc)
mc->init = palmte_init;
mc->ignore_memory_transaction_failures = true;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("ti925t");
+ mc->default_ram_size = 0x02000000;
+ mc->default_ram_id = "omap1.dram";
}
DEFINE_MACHINE("cheetah", palmte_machine_init)
--
2.7.4
- [PATCH v2 17/86] arm:integratorcp: use memdev for RAM, (continued)
- [PATCH v2 17/86] arm:integratorcp: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 16/86] arm:imx25_pdk: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 15/86] arm:imx25_pdk: drop RAM size fixup, Igor Mammedov, 2020/01/15
- [PATCH v2 20/86] arm:mcimx6ul-evk: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 21/86] arm:mcimx7d-sabre: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 23/86] arm:mps2: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 22/86] arm:mps2-tz: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 24/86] arm:musicpal: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 25/86] arm:nseries: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 27/86] arm:palm: use memdev for RAM,
Igor Mammedov <=
- [PATCH v2 26/86] arm:omap_sx1: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 29/86] arm:sabrelite: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 28/86] arm:raspi: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 31/86] arm:versatilepb: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 30/86] arm:sbsa-ref: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 32/86] arm:vexpress: use memdev for RAM, Igor Mammedov, 2020/01/15