diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-10-22 16:50:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-22 17:44:01 +0100 |
| commit | e285e8678e6af882c6266a9d588b6f99a837ed97 (patch) | |
| tree | 1c0294d052cfedc049621af8e851375a0eb12b05 /hw/arm/nseries.c | |
| parent | 3cd892daa3e402aedaa9f2809a9ba7216b2ce74f (diff) | |
| download | qemu-e285e8678e6af882c6266a9d588b6f99a837ed97.zip qemu-e285e8678e6af882c6266a9d588b6f99a837ed97.tar.gz qemu-e285e8678e6af882c6266a9d588b6f99a837ed97.tar.bz2 | |
hw/arm/omap2: Create the RAM in the board
The SDRAM is incorrectly created in the OMAP2420 SoC.
Move its creation in the board code, this will later allow the
board to have the QOM ownership of the RAM.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20191021190653.9511-5-philmd@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/nseries.c')
| -rw-r--r-- | hw/arm/nseries.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index a36971d..7e36193 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -47,6 +47,7 @@ /* Nokia N8x0 support */ struct n800_s { + MemoryRegion sdram; struct omap_mpu_state_s *mpu; struct rfbi_chip_s blizzard; @@ -1311,11 +1312,14 @@ static int n810_atag_setup(const struct arm_boot_info *info, void *p) static void n8x0_init(MachineState *machine, struct arm_boot_info *binfo, int model) { - MemoryRegion *sysmem = get_system_memory(); struct n800_s *s = (struct n800_s *) g_malloc0(sizeof(*s)); - int sdram_size = binfo->ram_size; + uint64_t sdram_size = binfo->ram_size; - s->mpu = omap2420_mpu_init(sysmem, sdram_size, machine->cpu_type); + memory_region_allocate_system_memory(&s->sdram, NULL, "omap2.dram", + sdram_size); + memory_region_add_subregion(get_system_memory(), OMAP2_Q2_BASE, &s->sdram); + + s->mpu = omap2420_mpu_init(&s->sdram, machine->cpu_type); /* Setup peripherals * |