xlnx-zynqmp: Swap Cortex-R5 for Cortex-R5F
The ZynqMP has Cortex-R5Fs with the optional FPU enabled. Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Message-id: 20180529124707.3025-3-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
ebac5458c7
commit
eb24d4d38e
@ -208,7 +208,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data)
|
|||||||
{
|
{
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
|
|
||||||
mc->desc = "Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5s based on " \
|
mc->desc = "Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs based on " \
|
||||||
"the value of smp";
|
"the value of smp";
|
||||||
mc->init = xlnx_zcu102_init;
|
mc->init = xlnx_zcu102_init;
|
||||||
mc->block_default_type = IF_IDE;
|
mc->block_default_type = IF_IDE;
|
||||||
|
@ -134,7 +134,7 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu,
|
|||||||
char *name;
|
char *name;
|
||||||
|
|
||||||
object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]),
|
object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]),
|
||||||
"cortex-r5-" TYPE_ARM_CPU);
|
"cortex-r5f-" TYPE_ARM_CPU);
|
||||||
object_property_add_child(OBJECT(s), "rpu-cpu[*]",
|
object_property_add_child(OBJECT(s), "rpu-cpu[*]",
|
||||||
OBJECT(&s->rpu_cpu[i]), &error_abort);
|
OBJECT(&s->rpu_cpu[i]), &error_abort);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user