From: Peter Crosthwaite Date: Mon, 18 Aug 2014 00:52:38 +0000 (-0700) Subject: microblaze: ml605: Get rid of ddr_base variable X-Git-Tag: qemu-xen-4.6.0-rc1~250^2~7 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f55f8852675f1ece8739b5f89aeda8418c483367;p=qemu-upstream-unstable.git microblaze: ml605: Get rid of ddr_base variable It's a constant based on a macro. Just use the macro in place. Signed-off-by: Peter Crosthwaite Signed-off-by: Michael Tokarev --- diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index aea9c5b49..6843abf54 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -89,7 +89,6 @@ petalogix_ml605_init(MachineState *machine) SysBusDevice *busdev; DriveInfo *dinfo; int i; - hwaddr ddr_base = MEMORY_BASEADDR; MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1); MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32]; @@ -106,7 +105,7 @@ petalogix_ml605_init(MachineState *machine) memory_region_init_ram(phys_ram, NULL, "petalogix_ml605.ram", ram_size); vmstate_register_ram_global(phys_ram); - memory_region_add_subregion(address_space_mem, ddr_base, phys_ram); + memory_region_add_subregion(address_space_mem, MEMORY_BASEADDR, phys_ram); dinfo = drive_get(IF_PFLASH, 0, 0); /* 5th parameter 2 means bank-width @@ -201,7 +200,7 @@ petalogix_ml605_init(MachineState *machine) } } - microblaze_load_kernel(cpu, ddr_base, ram_size, + microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, machine_cpu_reset);