arm/mcimx7d-sabre: use memdev for RAM
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: remove no longer needed MCIMX7Sabre Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20200219160953.13771-22-imammedo@redhat.com>
This commit is contained in:
parent
14dbfa556b
commit
4076cc9429
|
@ -21,15 +21,10 @@
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "sysemu/qtest.h"
|
#include "sysemu/qtest.h"
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
FslIMX7State soc;
|
|
||||||
MemoryRegion ram;
|
|
||||||
} MCIMX7Sabre;
|
|
||||||
|
|
||||||
static void mcimx7d_sabre_init(MachineState *machine)
|
static void mcimx7d_sabre_init(MachineState *machine)
|
||||||
{
|
{
|
||||||
static struct arm_boot_info boot_info;
|
static struct arm_boot_info boot_info;
|
||||||
MCIMX7Sabre *s = g_new0(MCIMX7Sabre, 1);
|
FslIMX7State *s;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (machine->ram_size > FSL_IMX7_MMDC_SIZE) {
|
if (machine->ram_size > FSL_IMX7_MMDC_SIZE) {
|
||||||
|
@ -45,15 +40,12 @@ static void mcimx7d_sabre_init(MachineState *machine)
|
||||||
.nb_cpus = machine->smp.cpus,
|
.nb_cpus = machine->smp.cpus,
|
||||||
};
|
};
|
||||||
|
|
||||||
object_initialize_child(OBJECT(machine), "soc",
|
s = FSL_IMX7(object_new(TYPE_FSL_IMX7));
|
||||||
&s->soc, sizeof(s->soc),
|
object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fatal);
|
||||||
TYPE_FSL_IMX7, &error_fatal, NULL);
|
object_property_set_bool(OBJECT(s), true, "realized", &error_fatal);
|
||||||
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);
|
|
||||||
|
|
||||||
memory_region_allocate_system_memory(&s->ram, NULL, "mcimx7d-sabre.ram",
|
memory_region_add_subregion(get_system_memory(), FSL_IMX7_MMDC_ADDR,
|
||||||
machine->ram_size);
|
machine->ram);
|
||||||
memory_region_add_subregion(get_system_memory(),
|
|
||||||
FSL_IMX7_MMDC_ADDR, &s->ram);
|
|
||||||
|
|
||||||
for (i = 0; i < FSL_IMX7_NUM_USDHCS; i++) {
|
for (i = 0; i < FSL_IMX7_NUM_USDHCS; i++) {
|
||||||
BusState *bus;
|
BusState *bus;
|
||||||
|
@ -63,7 +55,7 @@ static void mcimx7d_sabre_init(MachineState *machine)
|
||||||
|
|
||||||
di = drive_get_next(IF_SD);
|
di = drive_get_next(IF_SD);
|
||||||
blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
||||||
bus = qdev_get_child_bus(DEVICE(&s->soc.usdhc[i]), "sd-bus");
|
bus = qdev_get_child_bus(DEVICE(&s->usdhc[i]), "sd-bus");
|
||||||
carddev = qdev_create(bus, TYPE_SD_CARD);
|
carddev = qdev_create(bus, TYPE_SD_CARD);
|
||||||
qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);
|
qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);
|
||||||
object_property_set_bool(OBJECT(carddev), true,
|
object_property_set_bool(OBJECT(carddev), true,
|
||||||
|
@ -71,7 +63,7 @@ static void mcimx7d_sabre_init(MachineState *machine)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!qtest_enabled()) {
|
if (!qtest_enabled()) {
|
||||||
arm_load_kernel(&s->soc.cpu[0], machine, &boot_info);
|
arm_load_kernel(&s->cpu[0], machine, &boot_info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,5 +72,6 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc)
|
||||||
mc->desc = "Freescale i.MX7 DUAL SABRE (Cortex A7)";
|
mc->desc = "Freescale i.MX7 DUAL SABRE (Cortex A7)";
|
||||||
mc->init = mcimx7d_sabre_init;
|
mc->init = mcimx7d_sabre_init;
|
||||||
mc->max_cpus = FSL_IMX7_NUM_CPUS;
|
mc->max_cpus = FSL_IMX7_NUM_CPUS;
|
||||||
|
mc->default_ram_id = "mcimx7d-sabre.ram";
|
||||||
}
|
}
|
||||||
DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init)
|
DEFINE_MACHINE("mcimx7d-sabre", mcimx7d_sabre_machine_init)
|
||||||
|
|
Loading…
Reference in a new issue