| Message ID | 180514a5994d4b96e0c25499d90c895ab489b762.1463093051.git.alistair.francis@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On 12 May 2016 at 23:46, Alistair Francis <alistair.francis@xilinx.com> wrote: > From: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > > Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > --- > V4: > - Small corrections to the device model logic > > hw/arm/xilinx_zynq.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c > index 98b17c9..ffea3be 100644 > --- a/hw/arm/xilinx_zynq.c > +++ b/hw/arm/xilinx_zynq.c > @@ -293,6 +293,14 @@ static void zynq_init(MachineState *machine) > sysbus_connect_irq(busdev, n + 1, pic[dma_irqs[n] - IRQ_OFFSET]); > } > > + dev = qdev_create(NULL, "xlnx.ps7-dev-cfg"); > + object_property_add_child(qdev_get_machine(), "xlnx-devcfg", OBJECT(dev), > + NULL); Why do we need to do this? > + qdev_init_nofail(dev); > + busdev = SYS_BUS_DEVICE(dev); > + sysbus_connect_irq(busdev, 0, pic[40 - IRQ_OFFSET]); > + sysbus_mmio_map(busdev, 0, 0xF8007000); > + > zynq_binfo.ram_size = ram_size; > zynq_binfo.kernel_filename = kernel_filename; > zynq_binfo.kernel_cmdline = kernel_cmdline; > -- > 2.7.4 thanks -- PMM
On Fri, Jun 10, 2016 at 4:19 AM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 12 May 2016 at 23:46, Alistair Francis <alistair.francis@xilinx.com> wrote: >> From: Peter Crosthwaite <peter.crosthwaite@xilinx.com> >> >> Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> >> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> >> --- >> V4: >> - Small corrections to the device model logic >> >> hw/arm/xilinx_zynq.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c >> index 98b17c9..ffea3be 100644 >> --- a/hw/arm/xilinx_zynq.c >> +++ b/hw/arm/xilinx_zynq.c >> @@ -293,6 +293,14 @@ static void zynq_init(MachineState *machine) >> sysbus_connect_irq(busdev, n + 1, pic[dma_irqs[n] - IRQ_OFFSET]); >> } >> >> + dev = qdev_create(NULL, "xlnx.ps7-dev-cfg"); >> + object_property_add_child(qdev_get_machine(), "xlnx-devcfg", OBJECT(dev), >> + NULL); > > Why do we need to do this? I'm not sure why this is here, removing it. Thanks, Alistair > >> + qdev_init_nofail(dev); >> + busdev = SYS_BUS_DEVICE(dev); >> + sysbus_connect_irq(busdev, 0, pic[40 - IRQ_OFFSET]); >> + sysbus_mmio_map(busdev, 0, 0xF8007000); >> + >> zynq_binfo.ram_size = ram_size; >> zynq_binfo.kernel_filename = kernel_filename; >> zynq_binfo.kernel_cmdline = kernel_cmdline; >> -- >> 2.7.4 > > thanks > -- PMM >
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 98b17c9..ffea3be 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -293,6 +293,14 @@ static void zynq_init(MachineState *machine) sysbus_connect_irq(busdev, n + 1, pic[dma_irqs[n] - IRQ_OFFSET]); } + dev = qdev_create(NULL, "xlnx.ps7-dev-cfg"); + object_property_add_child(qdev_get_machine(), "xlnx-devcfg", OBJECT(dev), + NULL); + qdev_init_nofail(dev); + busdev = SYS_BUS_DEVICE(dev); + sysbus_connect_irq(busdev, 0, pic[40 - IRQ_OFFSET]); + sysbus_mmio_map(busdev, 0, 0xF8007000); + zynq_binfo.ram_size = ram_size; zynq_binfo.kernel_filename = kernel_filename; zynq_binfo.kernel_cmdline = kernel_cmdline;