diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-14 01:17:03 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:03 +0200 |
| commit | 59b91996b925d8cb7e971723ea1f3f8c38339505 (patch) | |
| tree | 560de14ebaef8893075426dec4c347e3f82f97e3 /hw | |
| parent | 518ec1342cf11169957b4f58ba23b1fdabb59d50 (diff) | |
| download | qemu-59b91996b925d8cb7e971723ea1f3f8c38339505.tar.gz | |
omap_sx1: Rename omap_mpu_state_s 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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/omap_sx1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index c7618c6cdf..b64e1ebebc 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -103,7 +103,7 @@ static void sx1_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model, const int version) { - struct omap_mpu_state_s *cpu; + struct omap_mpu_state_s *mpu; MemoryRegion *address_space = get_system_memory(); MemoryRegion *flash = 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; } - 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) */ 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_cmdline = kernel_cmdline; 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 */ |