unicore32: use generic cpu_model parsing
Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <1507211474-188400-29-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
6a82686647
commit
1aaa63193b
@ -112,7 +112,6 @@ static void puv3_load_kernel(const char *kernel_filename)
|
||||
static void puv3_init(MachineState *machine)
|
||||
{
|
||||
ram_addr_t ram_size = machine->ram_size;
|
||||
const char *cpu_model = machine->cpu_model;
|
||||
const char *kernel_filename = machine->kernel_filename;
|
||||
const char *initrd_filename = machine->initrd_filename;
|
||||
CPUUniCore32State *env;
|
||||
@ -123,11 +122,7 @@ static void puv3_init(MachineState *machine)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (!cpu_model) {
|
||||
cpu_model = "UniCore-II";
|
||||
}
|
||||
|
||||
cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
|
||||
cpu = UNICORE32_CPU(cpu_create(machine->cpu_type));
|
||||
env = &cpu->env;
|
||||
|
||||
puv3_soc_init(env);
|
||||
@ -140,6 +135,7 @@ static void puv3_machine_init(MachineClass *mc)
|
||||
mc->desc = "PKUnity Version-3 based on UniCore32";
|
||||
mc->init = puv3_init;
|
||||
mc->is_default = 1;
|
||||
mc->default_cpu_type = UNICORE32_CPU_TYPE_NAME("UniCore-II");
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("puv3", puv3_machine_init)
|
||||
|
Loading…
Reference in New Issue
Block a user