sun4u: Use cpu_sparc_init() to obtain SPARCCPU
This prepares using it in sun4uv_init(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
5414dec635
commit
8ebdf9dcc6
|
@ -754,6 +754,7 @@ static TypeInfo ram_info = {
|
||||||
|
|
||||||
static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef)
|
static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef)
|
||||||
{
|
{
|
||||||
|
SPARCCPU *cpu;
|
||||||
CPUSPARCState *env;
|
CPUSPARCState *env;
|
||||||
ResetData *reset_info;
|
ResetData *reset_info;
|
||||||
|
|
||||||
|
@ -761,13 +762,15 @@ static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef *hwd
|
||||||
uint32_t stick_frequency = 100*1000000;
|
uint32_t stick_frequency = 100*1000000;
|
||||||
uint32_t hstick_frequency = 100*1000000;
|
uint32_t hstick_frequency = 100*1000000;
|
||||||
|
|
||||||
if (!cpu_model)
|
if (cpu_model == NULL) {
|
||||||
cpu_model = hwdef->default_cpu_model;
|
cpu_model = hwdef->default_cpu_model;
|
||||||
env = cpu_init(cpu_model);
|
}
|
||||||
if (!env) {
|
cpu = cpu_sparc_init(cpu_model);
|
||||||
|
if (cpu == NULL) {
|
||||||
fprintf(stderr, "Unable to find Sparc CPU definition\n");
|
fprintf(stderr, "Unable to find Sparc CPU definition\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
env = &cpu->env;
|
||||||
|
|
||||||
env->tick = cpu_timer_create("tick", env, tick_irq,
|
env->tick = cpu_timer_create("tick", env, tick_irq,
|
||||||
tick_frequency, TICK_NPT_MASK);
|
tick_frequency, TICK_NPT_MASK);
|
||||||
|
|
Loading…
Reference in a new issue