hw/arm/fsl-imx: Add the cpu as child of the SoC object
Child properties form the composition tree. All objects need to be a child of another object. Objects can only be a child of one object. Respect this with the i.MX SoC, to get a cleaner composition tree. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20190823143249.8096-5-philmd@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
5e039af816
commit
eaa9a87828
|
@ -36,7 +36,9 @@ static void fsl_imx25_init(Object *obj)
|
||||||
FslIMX25State *s = FSL_IMX25(obj);
|
FslIMX25State *s = FSL_IMX25(obj);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
object_initialize(&s->cpu, sizeof(s->cpu), ARM_CPU_TYPE_NAME("arm926"));
|
object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),
|
||||||
|
ARM_CPU_TYPE_NAME("arm926"),
|
||||||
|
&error_abort, NULL);
|
||||||
|
|
||||||
sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
|
sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
|
||||||
TYPE_IMX_AVIC);
|
TYPE_IMX_AVIC);
|
||||||
|
|
|
@ -33,7 +33,9 @@ static void fsl_imx31_init(Object *obj)
|
||||||
FslIMX31State *s = FSL_IMX31(obj);
|
FslIMX31State *s = FSL_IMX31(obj);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
object_initialize(&s->cpu, sizeof(s->cpu), ARM_CPU_TYPE_NAME("arm1136"));
|
object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),
|
||||||
|
ARM_CPU_TYPE_NAME("arm1136"),
|
||||||
|
&error_abort, NULL);
|
||||||
|
|
||||||
sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
|
sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
|
||||||
TYPE_IMX_AVIC);
|
TYPE_IMX_AVIC);
|
||||||
|
|
Loading…
Reference in a new issue