|
@@ -82,10 +82,6 @@ static void m2sxxx_soc_initfn(Object *obj)
|
|
}
|
|
}
|
|
|
|
|
|
object_initialize_child(obj, "emac", &s->emac, TYPE_MSS_EMAC);
|
|
object_initialize_child(obj, "emac", &s->emac, TYPE_MSS_EMAC);
|
|
- if (nd_table[0].used) {
|
|
|
|
- qemu_check_nic_model(&nd_table[0], TYPE_MSS_EMAC);
|
|
|
|
- qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
|
|
static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
|
|
@@ -187,6 +183,11 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
|
|
g_free(bus_name);
|
|
g_free(bus_name);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /* FIXME use qdev NIC properties instead of nd_table[] */
|
|
|
|
+ if (nd_table[0].used) {
|
|
|
|
+ qemu_check_nic_model(&nd_table[0], TYPE_MSS_EMAC);
|
|
|
|
+ qdev_set_nic_properties(DEVICE(&s->emac), &nd_table[0]);
|
|
|
|
+ }
|
|
dev = DEVICE(&s->emac);
|
|
dev = DEVICE(&s->emac);
|
|
object_property_set_link(OBJECT(&s->emac), "ahb-bus",
|
|
object_property_set_link(OBJECT(&s->emac), "ahb-bus",
|
|
OBJECT(get_system_memory()), &error_abort);
|
|
OBJECT(get_system_memory()), &error_abort);
|