Commit dca6eeed authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Peter Maydell
Browse files

arm: highbank: Defeature CPU override 



This board should not support CPU model override. This allows for
easier patching of the board with being able to rely on the CPU
type being correct.

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 471a61e049c7ca6e82f5ef6668889a1d518c7e00.1447007690.git.crosthwaite.peter@gmail.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent baf6b681

hw/arm/highbank.c

+7 −14
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
    MemoryRegion *sysmem;

    char *sysboot_filename;



    if (!cpu_model) {

    switch (machine_id) {

    case CALXEDA_HIGHBANK:

        cpu_model = "cortex-a9";
@@ -232,7 +231,6 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        cpu_model = "cortex-a15";

        break;

    }

    }



    for (n = 0; n < smp_cpus; n++) {

        ObjectClass *oc = cpu_class_by_name(TYPE_ARM_CPU, cpu_model);
@@ -240,11 +238,6 @@ static void calxeda_init(MachineState *machine, enum cxmachines machine_id) 
        ARMCPU *cpu;

        Error *err = NULL;



        if (!oc) {

            error_report("Unable to find CPU definition");

            exit(1);

        }



        cpuobj = object_new(object_class_get_name(oc));

        cpu = ARM_CPU(cpuobj);