proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-15 04:09:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

omap_sx1: Rename omap_mpu_state_s 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:17:03 +02:00
parent 518ec1342c
commit 59b91996b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/omap_sx1.c
View File

@ -103,7 +103,7 @@ static void sx1_init(ram_addr_t ram_size,
const char *initrd_filename, const char *cpu_model, const char *initrd_filename, const char *cpu_model,
const int version) const int version)
{ {
struct omap_mpu_state_s *cpu; struct omap_mpu_state_s *mpu;
MemoryRegion *address_space = get_system_memory(); MemoryRegion *address_space = get_system_memory();
MemoryRegion *flash = g_new(MemoryRegion, 1); MemoryRegion *flash = g_new(MemoryRegion, 1);
MemoryRegion *flash_1 = g_new(MemoryRegion, 1); MemoryRegion *flash_1 = g_new(MemoryRegion, 1);
@ -121,7 +121,7 @@ static void sx1_init(ram_addr_t ram_size,
flash_size = flash2_size; flash_size = flash2_size;
} }
cpu = omap310_mpu_init(address_space, sx1_binfo.ram_size, cpu_model); mpu = omap310_mpu_init(address_space, sx1_binfo.ram_size, cpu_model);
/* External Flash (EMIFS) */ /* External Flash (EMIFS) */
memory_region_init_ram(flash, "omap_sx1.flash0-0", flash_size); memory_region_init_ram(flash, "omap_sx1.flash0-0", flash_size);
@ -202,7 +202,7 @@ static void sx1_init(ram_addr_t ram_size,
sx1_binfo.kernel_filename = kernel_filename; sx1_binfo.kernel_filename = kernel_filename;
sx1_binfo.kernel_cmdline = kernel_cmdline; sx1_binfo.kernel_cmdline = kernel_cmdline;
sx1_binfo.initrd_filename = initrd_filename; sx1_binfo.initrd_filename = initrd_filename;
arm_load_kernel(&cpu->cpu->env, &sx1_binfo); arm_load_kernel(&mpu->cpu->env, &sx1_binfo);
} }
/* TODO: fix next line */ /* TODO: fix next line */