david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spitz: Rename PXA2xxState variable

Browse Source 
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:
Andreas Färber 2012-05-14 01:22:03 +02:00
parent 1c88de673e
commit 2e7ad76018
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/spitz.c
View File

@ -884,7 +884,7 @@ static void spitz_common_init(ram_addr_t ram_size,
const char *kernel_cmdline, const char *initrd_filename, const char *kernel_cmdline, const char *initrd_filename,
const char *cpu_model, enum spitz_model_e model, int arm_id) const char *cpu_model, enum spitz_model_e model, int arm_id)
{ {
PXA2xxState *cpu; PXA2xxState *mpu;
DeviceState *scp0, *scp1 = NULL; DeviceState *scp0, *scp1 = NULL;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *rom = g_new(MemoryRegion, 1); MemoryRegion *rom = g_new(MemoryRegion, 1);
@ -893,9 +893,9 @@ static void spitz_common_init(ram_addr_t ram_size,
cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0"; cpu_model = (model == terrier) ? "pxa270-c5" : "pxa270-c0";
/* Setup CPU & memory */ /* Setup CPU & memory */
cpu = pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_model); mpu = pxa270_init(address_space_mem, spitz_binfo.ram_size, cpu_model);
sl_flash_register(cpu, (model == spitz) ? FLASH_128M : FLASH_1024M); sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
memory_region_init_ram(rom, "spitz.rom", SPITZ_ROM); memory_region_init_ram(rom, "spitz.rom", SPITZ_ROM);
vmstate_register_ram_global(rom); vmstate_register_ram_global(rom);
@ -903,36 +903,36 @@ static void spitz_common_init(ram_addr_t ram_size,
memory_region_add_subregion(address_space_mem, 0, rom); memory_region_add_subregion(address_space_mem, 0, rom);
/* Setup peripherals */ /* Setup peripherals */
spitz_keyboard_register(cpu); spitz_keyboard_register(mpu);
spitz_ssp_attach(cpu); spitz_ssp_attach(mpu);
scp0 = sysbus_create_simple("scoop", 0x10800000, NULL); scp0 = sysbus_create_simple("scoop", 0x10800000, NULL);
if (model != akita) { if (model != akita) {
scp1 = sysbus_create_simple("scoop", 0x08800040, NULL); scp1 = sysbus_create_simple("scoop", 0x08800040, NULL);
} }
spitz_scoop_gpio_setup(cpu, scp0, scp1); spitz_scoop_gpio_setup(mpu, scp0, scp1);
spitz_gpio_setup(cpu, (model == akita) ? 1 : 2); spitz_gpio_setup(mpu, (model == akita) ? 1 : 2);
spitz_i2c_setup(cpu); spitz_i2c_setup(mpu);
if (model == akita) if (model == akita)
spitz_akita_i2c_setup(cpu); spitz_akita_i2c_setup(mpu);
if (model == terrier) if (model == terrier)
/* A 6.0 GB microdrive is permanently sitting in CF slot 1. */ /* A 6.0 GB microdrive is permanently sitting in CF slot 1. */
spitz_microdrive_attach(cpu, 1); spitz_microdrive_attach(mpu, 1);
else if (model != akita) else if (model != akita)
/* A 4.0 GB microdrive is permanently sitting in CF slot 0. */ /* A 4.0 GB microdrive is permanently sitting in CF slot 0. */
spitz_microdrive_attach(cpu, 0); spitz_microdrive_attach(mpu, 0);
spitz_binfo.kernel_filename = kernel_filename; spitz_binfo.kernel_filename = kernel_filename;
spitz_binfo.kernel_cmdline = kernel_cmdline; spitz_binfo.kernel_cmdline = kernel_cmdline;
spitz_binfo.initrd_filename = initrd_filename; spitz_binfo.initrd_filename = initrd_filename;
spitz_binfo.board_id = arm_id; spitz_binfo.board_id = arm_id;
arm_load_kernel(&cpu->cpu->env, &spitz_binfo); arm_load_kernel(&mpu->cpu->env, &spitz_binfo);
sl_bootparam_write(SL_PXA_PARAM_BASE); sl_bootparam_write(SL_PXA_PARAM_BASE);
} }