vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc: virtex-ml507: replace cpu_model with cpu_type 

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
master
Igor Mammedov 2017-10-09 21:50:56 +02:00 committed by David Gibson
parent 9391b8c563
commit 6bab8eaa95
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ppc/virtex_ml507.c
View File

@ -89,14 +89,14 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env,
static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size, static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size,
int do_init, int do_init,
const char *cpu_model, const char *cpu_type,
uint32_t sysclk) uint32_t sysclk)
{ {
PowerPCCPU *cpu; PowerPCCPU *cpu;
CPUPPCState *env; CPUPPCState *env;
qemu_irq *irqs; qemu_irq *irqs;
cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); cpu = POWERPC_CPU(cpu_create(cpu_type));
env = &cpu->env; env = &cpu->env;
ppc_booke_timers_init(cpu, sysclk, 0/* no flags */); ppc_booke_timers_init(cpu, sysclk, 0/* no flags */);
@ -211,11 +211,7 @@ static void virtex_init(MachineState *machine)
int i; int i;
/* init CPUs */ /* init CPUs */
if (machine->cpu_model == NULL) { cpu = ppc440_init_xilinx(&ram_size, 1, machine->cpu_type, 400000000);
machine->cpu_model = "440-Xilinx";
}
cpu = ppc440_init_xilinx(&ram_size, 1, machine->cpu_model, 400000000);
env = &cpu->env; env = &cpu->env;
if (env->mmu_model != POWERPC_MMU_BOOKE) { if (env->mmu_model != POWERPC_MMU_BOOKE) {
@ -307,6 +303,7 @@ static void virtex_machine_init(MachineClass *mc)
{ {
mc->desc = "Xilinx Virtex ML507 reference design"; mc->desc = "Xilinx Virtex ML507 reference design";
mc->init = virtex_init; mc->init = virtex_init;
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("440-xilinx");
} }
DEFINE_MACHINE("virtex-ml507", virtex_machine_init) DEFINE_MACHINE("virtex-ml507", virtex_machine_init)