diff options
| author | Peter Crosthwaite | 2014-02-26 01:41:14 +0100 |
|---|---|---|
| committer | Edgar E. Iglesias | 2014-02-26 05:54:45 +0100 |
| commit | b8d4e1c43b06caadf96c350511201fd50642e4f2 (patch) | |
| tree | 83df8212f5862e4ff0ce53d0570ac8683289c8ab /hw/microblaze | |
| parent | xilinx: Inline usages of xilinx_timer_create() (diff) | |
| download | qemu-b8d4e1c43b06caadf96c350511201fd50642e4f2.tar.gz qemu-b8d4e1c43b06caadf96c350511201fd50642e4f2.tar.xz qemu-b8d4e1c43b06caadf96c350511201fd50642e4f2.zip | |
xilinx: Inline usage of xilinx_ethlite_create()
Inline the only usage. Converts this init to at least a semi-recent QOM
styling.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'hw/microblaze')
| -rw-r--r-- | hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index a85dbb72a0..408e0a4765 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -119,7 +119,14 @@ petalogix_s3adsp1800_init(QEMUMachineInitArgs *args) sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]); - xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0); + qemu_check_nic_model(&nd_table[0], "xlnx.xps-ethernetlite"); + dev = qdev_create(NULL, "xlnx.xps-ethernetlite"); + qdev_set_nic_properties(dev, &nd_table[0]); + qdev_prop_set_uint32(dev, "tx-ping-pong", 0); + qdev_prop_set_uint32(dev, "rx-ping-pong", 0); + qdev_init_nofail(dev); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, ETHLITE_BASEADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[ETHLITE_IRQ]); microblaze_load_kernel(cpu, ddr_base, ram_size, args->initrd_filename, |