Commit 2b0b9321 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/arm/bcm2836: Use the Cortex-A7 instead of Cortex-A15 

The BCM2836 uses a Cortex-A7, not a Cortex-A15. Update the device to
use the correct CPU.
https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2836/QA7_rev3.4.pdf



When the BCM2836 was introduced (bad56236) the Cortex-A7 was not
available, so the very similar Cortex-A15 was used. Since dcf578ed
we can model the correct core.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlistair Francis <alistair@alistair23.me>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180319110215.16755-1-peter.maydell@linaro.org
parent a2e2d7fc

hw/arm/bcm2836.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct BCM283XInfo { 
static const BCM283XInfo bcm283x_socs[] = {

    {

        .name = TYPE_BCM2836,

        .cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"),

        .cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"),

        .clusterid = 0xf,

    },

#ifdef TARGET_AARCH64

hw/arm/raspi.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static void raspi2_machine_init(MachineClass *mc) 
    mc->no_parallel = 1;

    mc->no_floppy = 1;

    mc->no_cdrom = 1;

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");

    mc->max_cpus = BCM283X_NCPUS;

    mc->min_cpus = BCM283X_NCPUS;

    mc->default_cpus = BCM283X_NCPUS;