tosa: Rename PXA2xxState variable
Avoid cpu->cpu by using "mpu" as variable name. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
2e7ad76018
commit
8efa35e073
14
hw/tosa.c
14
hw/tosa.c
|
@ -212,14 +212,14 @@ static void tosa_init(ram_addr_t ram_size,
|
|||
{
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *rom = g_new(MemoryRegion, 1);
|
||||
PXA2xxState *cpu;
|
||||
PXA2xxState *mpu;
|
||||
TC6393xbState *tmio;
|
||||
DeviceState *scp0, *scp1;
|
||||
|
||||
if (!cpu_model)
|
||||
cpu_model = "pxa255";
|
||||
|
||||
cpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
|
||||
mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
|
||||
|
||||
memory_region_init_ram(rom, "tosa.rom", TOSA_ROM);
|
||||
vmstate_register_ram_global(rom);
|
||||
|
@ -227,22 +227,22 @@ static void tosa_init(ram_addr_t ram_size,
|
|||
memory_region_add_subregion(address_space_mem, 0, rom);
|
||||
|
||||
tmio = tc6393xb_init(address_space_mem, 0x10000000,
|
||||
qdev_get_gpio_in(cpu->gpio, TOSA_GPIO_TC6393XB_INT));
|
||||
qdev_get_gpio_in(mpu->gpio, TOSA_GPIO_TC6393XB_INT));
|
||||
|
||||
scp0 = sysbus_create_simple("scoop", 0x08800000, NULL);
|
||||
scp1 = sysbus_create_simple("scoop", 0x14800040, NULL);
|
||||
|
||||
tosa_gpio_setup(cpu, scp0, scp1, tmio);
|
||||
tosa_gpio_setup(mpu, scp0, scp1, tmio);
|
||||
|
||||
tosa_microdrive_attach(cpu);
|
||||
tosa_microdrive_attach(mpu);
|
||||
|
||||
tosa_tg_init(cpu);
|
||||
tosa_tg_init(mpu);
|
||||
|
||||
tosa_binfo.kernel_filename = kernel_filename;
|
||||
tosa_binfo.kernel_cmdline = kernel_cmdline;
|
||||
tosa_binfo.initrd_filename = initrd_filename;
|
||||
tosa_binfo.board_id = 0x208;
|
||||
arm_load_kernel(&cpu->cpu->env, &tosa_binfo);
|
||||
arm_load_kernel(&mpu->cpu->env, &tosa_binfo);
|
||||
sl_bootparam_write(SL_PXA_PARAM_BASE);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue