ARM/highbank: add support for Calxeda ECX-2000 / Midway
The Calxeda ECX-2000 chip (aka. Midway) is model-wise quite similar to the Highbank. The most prominent difference is the Cortex-A15 CPU core in it, together with the associated core peripherals. Add a new ARM machine type called "midway". Move the L2 cache controller device into the Highbank specific part, since Midway does not have (and need) it. Signed-off-by: Andre Przywara <andre.przywara@calxeda.com> Message-id: 1373026897-12085-3-git-send-email-andre.przywara@calxeda.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
574f66bcbe
commit
b25a83f053
|
@ -185,6 +185,7 @@ static struct arm_boot_info highbank_binfo;
|
||||||
|
|
||||||
enum cxmachines {
|
enum cxmachines {
|
||||||
CALXEDA_HIGHBANK,
|
CALXEDA_HIGHBANK,
|
||||||
|
CALXEDA_MIDWAY,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ram_size must be set to match the upper bound of memory in the
|
/* ram_size must be set to match the upper bound of memory in the
|
||||||
|
@ -216,6 +217,9 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine)
|
||||||
case CALXEDA_HIGHBANK:
|
case CALXEDA_HIGHBANK:
|
||||||
cpu_model = "cortex-a9";
|
cpu_model = "cortex-a9";
|
||||||
break;
|
break;
|
||||||
|
case CALXEDA_MIDWAY:
|
||||||
|
cpu_model = "cortex-a15";
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -256,8 +260,16 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine)
|
||||||
|
|
||||||
switch (machine) {
|
switch (machine) {
|
||||||
case CALXEDA_HIGHBANK:
|
case CALXEDA_HIGHBANK:
|
||||||
|
dev = qdev_create(NULL, "l2x0");
|
||||||
|
qdev_init_nofail(dev);
|
||||||
|
busdev = SYS_BUS_DEVICE(dev);
|
||||||
|
sysbus_mmio_map(busdev, 0, 0xfff12000);
|
||||||
|
|
||||||
dev = qdev_create(NULL, "a9mpcore_priv");
|
dev = qdev_create(NULL, "a9mpcore_priv");
|
||||||
break;
|
break;
|
||||||
|
case CALXEDA_MIDWAY:
|
||||||
|
dev = qdev_create(NULL, "a15mpcore_priv");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
qdev_prop_set_uint32(dev, "num-cpu", smp_cpus);
|
qdev_prop_set_uint32(dev, "num-cpu", smp_cpus);
|
||||||
qdev_prop_set_uint32(dev, "num-irq", NIRQ_GIC);
|
qdev_prop_set_uint32(dev, "num-irq", NIRQ_GIC);
|
||||||
|
@ -272,11 +284,6 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine)
|
||||||
pic[n] = qdev_get_gpio_in(dev, n);
|
pic[n] = qdev_get_gpio_in(dev, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
dev = qdev_create(NULL, "l2x0");
|
|
||||||
qdev_init_nofail(dev);
|
|
||||||
busdev = SYS_BUS_DEVICE(dev);
|
|
||||||
sysbus_mmio_map(busdev, 0, 0xfff12000);
|
|
||||||
|
|
||||||
dev = qdev_create(NULL, "sp804");
|
dev = qdev_create(NULL, "sp804");
|
||||||
qdev_prop_set_uint32(dev, "freq0", 150000000);
|
qdev_prop_set_uint32(dev, "freq0", 150000000);
|
||||||
qdev_prop_set_uint32(dev, "freq1", 150000000);
|
qdev_prop_set_uint32(dev, "freq1", 150000000);
|
||||||
|
@ -341,6 +348,11 @@ static void highbank_init(QEMUMachineInitArgs *args)
|
||||||
calxeda_init(args, CALXEDA_HIGHBANK);
|
calxeda_init(args, CALXEDA_HIGHBANK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void midway_init(QEMUMachineInitArgs *args)
|
||||||
|
{
|
||||||
|
calxeda_init(args, CALXEDA_MIDWAY);
|
||||||
|
}
|
||||||
|
|
||||||
static QEMUMachine highbank_machine = {
|
static QEMUMachine highbank_machine = {
|
||||||
.name = "highbank",
|
.name = "highbank",
|
||||||
.desc = "Calxeda Highbank (ECX-1000)",
|
.desc = "Calxeda Highbank (ECX-1000)",
|
||||||
|
@ -350,9 +362,19 @@ static QEMUMachine highbank_machine = {
|
||||||
DEFAULT_MACHINE_OPTIONS,
|
DEFAULT_MACHINE_OPTIONS,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static QEMUMachine midway_machine = {
|
||||||
|
.name = "midway",
|
||||||
|
.desc = "Calxeda Midway (ECX-2000)",
|
||||||
|
.init = midway_init,
|
||||||
|
.block_default_type = IF_SCSI,
|
||||||
|
.max_cpus = 4,
|
||||||
|
DEFAULT_MACHINE_OPTIONS,
|
||||||
|
};
|
||||||
|
|
||||||
static void calxeda_machines_init(void)
|
static void calxeda_machines_init(void)
|
||||||
{
|
{
|
||||||
qemu_register_machine(&highbank_machine);
|
qemu_register_machine(&highbank_machine);
|
||||||
|
qemu_register_machine(&midway_machine);
|
||||||
}
|
}
|
||||||
|
|
||||||
machine_init(calxeda_machines_init);
|
machine_init(calxeda_machines_init);
|
||||||
|
|
Loading…
Reference in a new issue