On 13 March 2018 at 15:34, Peter Maydell <peter.mayd...@linaro.org> wrote: > Now we have separate types for BCM2386 and BCM2387, we might as well > just hard-code the CPU type they use rather than having it passed > through as an object property. This then lets us put the initialization > of the CPU object in init rather than realize. > > Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> > --- > hw/arm/bcm2836.c | 22 +++++++++++++--------- > hw/arm/raspi.c | 2 -- > 2 files changed, 13 insertions(+), 11 deletions(-) > > diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c > index 7140257c98..12f75b55a7 100644 > --- a/hw/arm/bcm2836.c > +++ b/hw/arm/bcm2836.c > @@ -25,16 +25,19 @@ > > struct BCM283XInfo { > const char *name; > + const char *cpu_type; > int clusterid; > }; > > static const BCM283XInfo bcm283x_socs[] = { > { > .name = TYPE_BCM2836, > + .cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"), > .clusterid = 0xf, > }, > { > .name = TYPE_BCM2837, > + .cpu_type = ARM_CPU_TYPE_NAME("cortex-a53"), > .clusterid = 0x0, > }, > };
With this change we need to also add #ifdef TARGET_AARCH64 #endif around the entry in the array for bcm2837. Otherwise the device-introspection tests in 'make check' will fail trying to create the bcm2837 in qemu-system-arm, because there there is no cortex-a53 device. I'll just squash that into this patch... thanks -- PMM