|
@@ -45,7 +45,7 @@
|
|
#define MVBAR_ADDR 0x200
|
|
#define MVBAR_ADDR 0x200
|
|
#define BOARD_SETUP_ADDR (MVBAR_ADDR + 8 * sizeof(uint32_t))
|
|
#define BOARD_SETUP_ADDR (MVBAR_ADDR + 8 * sizeof(uint32_t))
|
|
|
|
|
|
-#define NIRQ_GIC 160
|
|
|
|
|
|
+#define GIC_EXT_IRQS 128 /* EnergyCore ECX-1000 & ECX-2000 */
|
|
|
|
|
|
/* Board init. */
|
|
/* Board init. */
|
|
|
|
|
|
@@ -180,7 +180,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
|
{
|
|
{
|
|
DeviceState *dev = NULL;
|
|
DeviceState *dev = NULL;
|
|
SysBusDevice *busdev;
|
|
SysBusDevice *busdev;
|
|
- qemu_irq pic[128];
|
|
|
|
|
|
+ qemu_irq pic[GIC_EXT_IRQS];
|
|
int n;
|
|
int n;
|
|
unsigned int smp_cpus = machine->smp.cpus;
|
|
unsigned int smp_cpus = machine->smp.cpus;
|
|
qemu_irq cpu_irq[4];
|
|
qemu_irq cpu_irq[4];
|
|
@@ -260,7 +260,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
|
break;
|
|
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", GIC_EXT_IRQS + GIC_INTERNAL);
|
|
busdev = SYS_BUS_DEVICE(dev);
|
|
busdev = SYS_BUS_DEVICE(dev);
|
|
sysbus_realize_and_unref(busdev, &error_fatal);
|
|
sysbus_realize_and_unref(busdev, &error_fatal);
|
|
sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
|
|
sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
|
|
@@ -271,7 +271,7 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id)
|
|
sysbus_connect_irq(busdev, n + 3 * smp_cpus, cpu_vfiq[n]);
|
|
sysbus_connect_irq(busdev, n + 3 * smp_cpus, cpu_vfiq[n]);
|
|
}
|
|
}
|
|
|
|
|
|
- for (n = 0; n < 128; n++) {
|
|
|
|
|
|
+ for (n = 0; n < GIC_EXT_IRQS; n++) {
|
|
pic[n] = qdev_get_gpio_in(dev, n);
|
|
pic[n] = qdev_get_gpio_in(dev, n);
|
|
}
|
|
}
|
|
|
|
|