hw/arm/raspi: Trivial code movement
There is no point in creating the SoC object before allocating the RAM. Move the call to keep all the SoC-related calls together. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: Igor Mammedov <imammedo@redhat.com> Message-id: 20200208165645.15657-7-f4bug@amsat.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
2e664b45f4
commit
cc360632f6
|
@ -227,9 +227,6 @@ static void raspi_init(MachineState *machine, uint32_t board_rev)
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
|
|
||||||
board_soc_type(board_rev), &error_abort, NULL);
|
|
||||||
|
|
||||||
/* Allocate and map RAM */
|
/* Allocate and map RAM */
|
||||||
memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram",
|
memory_region_allocate_system_memory(&s->ram, OBJECT(machine), "ram",
|
||||||
machine->ram_size);
|
machine->ram_size);
|
||||||
|
@ -237,6 +234,8 @@ static void raspi_init(MachineState *machine, uint32_t board_rev)
|
||||||
memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0);
|
memory_region_add_subregion_overlap(get_system_memory(), 0, &s->ram, 0);
|
||||||
|
|
||||||
/* Setup the SOC */
|
/* Setup the SOC */
|
||||||
|
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
|
||||||
|
board_soc_type(board_rev), &error_abort, NULL);
|
||||||
object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),
|
object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram),
|
||||||
&error_abort);
|
&error_abort);
|
||||||
object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
|
object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev",
|
||||||
|
|
Loading…
Reference in a new issue