mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
hw/arm: Check CPU type in machine_run_board_init()
Set mc->valid_cpu_types so that the user specified CPU type can be validated in machine_run_board_init(). We needn't to do it by ourselves. Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20231204004726.483558-9-gshan@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
parent
dbf8e8c433
commit
3e71f4a706
8 changed files with 74 additions and 50 deletions
|
@ -49,12 +49,6 @@ static void orangepi_init(MachineState *machine)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
/* Only allow Cortex-A7 for this board */
|
||||
if (strcmp(machine->cpu_type, ARM_CPU_TYPE_NAME("cortex-a7")) != 0) {
|
||||
error_report("This board can only be used with cortex-a7 CPU");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
h3 = AW_H3(object_new(TYPE_AW_H3));
|
||||
object_property_add_child(OBJECT(machine), "soc", OBJECT(h3));
|
||||
object_unref(OBJECT(h3));
|
||||
|
@ -111,6 +105,11 @@ static void orangepi_init(MachineState *machine)
|
|||
|
||||
static void orangepi_machine_init(MachineClass *mc)
|
||||
{
|
||||
static const char * const valid_cpu_types[] = {
|
||||
ARM_CPU_TYPE_NAME("cortex-a7"),
|
||||
NULL
|
||||
};
|
||||
|
||||
mc->desc = "Orange Pi PC (Cortex-A7)";
|
||||
mc->init = orangepi_init;
|
||||
mc->block_default_type = IF_SD;
|
||||
|
@ -119,6 +118,7 @@ static void orangepi_machine_init(MachineClass *mc)
|
|||
mc->max_cpus = AW_H3_NUM_CPUS;
|
||||
mc->default_cpus = AW_H3_NUM_CPUS;
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->default_ram_size = 1 * GiB;
|
||||
mc->default_ram_id = "orangepi.ram";
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue