Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 19:15:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lm32: lm32_boards: use generic cpu_model parsing

Browse Source 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Michael Walle <michael@walle.cc>
Message-Id: <1507211474-188400-11-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-10-05 15:50:44 +02:00 committed by Eduardo Habkost
parent 201c160e94
commit 6e0f9a2344
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/lm32/lm32_boards.c
View File

@ -75,7 +75,6 @@ static void main_cpu_reset(void *opaque)
static void lm32_evr_init(MachineState *machine) static void lm32_evr_init(MachineState *machine)
{ {
const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
LM32CPU *cpu; LM32CPU *cpu;
CPULM32State *env; CPULM32State *env;
@ -101,10 +100,7 @@ static void lm32_evr_init(MachineState *machine)
reset_info = g_malloc0(sizeof(ResetInfo)); reset_info = g_malloc0(sizeof(ResetInfo));
if (cpu_model == NULL) { cpu = LM32_CPU(cpu_create(machine->cpu_type));
cpu_model = "lm32-full";
}
cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));
env = &cpu->env; env = &cpu->env;
reset_info->cpu = cpu; reset_info->cpu = cpu;
@ -163,7 +159,6 @@ static void lm32_evr_init(MachineState *machine)
static void lm32_uclinux_init(MachineState *machine) static void lm32_uclinux_init(MachineState *machine)
{ {
const char *cpu_model = machine->cpu_model;
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline; const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename; const char *initrd_filename = machine->initrd_filename;
@ -198,10 +193,7 @@ static void lm32_uclinux_init(MachineState *machine)
reset_info = g_malloc0(sizeof(ResetInfo)); reset_info = g_malloc0(sizeof(ResetInfo));
if (cpu_model == NULL) { cpu = LM32_CPU(cpu_create(machine->cpu_type));
cpu_model = "lm32-full";
}
cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));
env = &cpu->env; env = &cpu->env;
reset_info->cpu = cpu; reset_info->cpu = cpu;
@ -295,6 +287,7 @@ static void lm32_evr_class_init(ObjectClass *oc, void *data)
mc->desc = "LatticeMico32 EVR32 eval system"; mc->desc = "LatticeMico32 EVR32 eval system";
mc->init = lm32_evr_init; mc->init = lm32_evr_init;
mc->is_default = 1; mc->is_default = 1;
mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");
} }
static const TypeInfo lm32_evr_type = { static const TypeInfo lm32_evr_type = {
@ -310,6 +303,7 @@ static void lm32_uclinux_class_init(ObjectClass *oc, void *data)
mc->desc = "lm32 platform for uClinux and u-boot by Theobroma Systems"; mc->desc = "lm32 platform for uClinux and u-boot by Theobroma Systems";
mc->init = lm32_uclinux_init; mc->init = lm32_uclinux_init;
mc->is_default = 0; mc->is_default = 0;
mc->default_cpu_type = LM32_CPU_TYPE_NAME("lm32-full");
} }
static const TypeInfo lm32_uclinux_type = { static const TypeInfo lm32_uclinux_type = {