hw/arm/raspi: Don't bother setting default_cpu_type
In commit210f47840d
, we changed the bcm2836 SoC object to always create a CPU of the correct type for that SoC model. This makes the default_cpu_type settings in the MachineClass structs for the raspi2 and raspi3 boards redundant. We didn't change those at the time because it would have meant a temporary regression in a corner case of error handling if the user requested a non-existing CPU type. The -cpu parse handling changes in2278b93941
mean that it no longer implicitly depends on default_cpu_type for this to work, so we can now delete the redundant default_cpu_type fields. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20180420155547.9497-1-peter.maydell@linaro.org
This commit is contained in:
parent
e4e91a217c
commit
b901a17245
|
@ -226,7 +226,6 @@ static void raspi2_machine_init(MachineClass *mc)
|
||||||
mc->no_parallel = 1;
|
mc->no_parallel = 1;
|
||||||
mc->no_floppy = 1;
|
mc->no_floppy = 1;
|
||||||
mc->no_cdrom = 1;
|
mc->no_cdrom = 1;
|
||||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");
|
|
||||||
mc->max_cpus = BCM283X_NCPUS;
|
mc->max_cpus = BCM283X_NCPUS;
|
||||||
mc->min_cpus = BCM283X_NCPUS;
|
mc->min_cpus = BCM283X_NCPUS;
|
||||||
mc->default_cpus = BCM283X_NCPUS;
|
mc->default_cpus = BCM283X_NCPUS;
|
||||||
|
@ -249,7 +248,6 @@ static void raspi3_machine_init(MachineClass *mc)
|
||||||
mc->no_parallel = 1;
|
mc->no_parallel = 1;
|
||||||
mc->no_floppy = 1;
|
mc->no_floppy = 1;
|
||||||
mc->no_cdrom = 1;
|
mc->no_cdrom = 1;
|
||||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53");
|
|
||||||
mc->max_cpus = BCM283X_NCPUS;
|
mc->max_cpus = BCM283X_NCPUS;
|
||||||
mc->min_cpus = BCM283X_NCPUS;
|
mc->min_cpus = BCM283X_NCPUS;
|
||||||
mc->default_cpus = BCM283X_NCPUS;
|
mc->default_cpus = BCM283X_NCPUS;
|
||||||
|
|
Loading…
Reference in a new issue