Revision a8170e5e hw/microblaze_boot.c

b/hw/microblaze_boot.c
55 55
    }
56 56
}
57 57

  
58
static int microblaze_load_dtb(target_phys_addr_t addr,
58
static int microblaze_load_dtb(hwaddr addr,
59 59
                                      uint32_t ramsize,
60 60
                                      const char *kernel_cmdline,
61 61
                                      const char *dtb_filename)
......
100 100
    return addr - 0x30000000LL;
101 101
}
102 102

  
103
void microblaze_load_kernel(MicroBlazeCPU *cpu, target_phys_addr_t ddr_base,
103
void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
104 104
                            uint32_t ramsize, const char *dtb_filename,
105 105
                            void (*machine_cpu_reset)(MicroBlazeCPU *))
106 106
{
......
149 149

  
150 150
        /* If it wasn't an ELF image, try an u-boot image.  */
151 151
        if (kernel_size < 0) {
152
            target_phys_addr_t uentry, loadaddr;
152
            hwaddr uentry, loadaddr;
153 153

  
154 154
            kernel_size = load_uimage(kernel_filename, &uentry, &loadaddr, 0);
155 155
            boot_info.bootstrap_pc = uentry;

Also available in: Unified diff