Revision a8170e5e hw/ppc/e500.c

b/hw/ppc/e500.c
108 108

  
109 109
static int ppce500_load_device_tree(CPUPPCState *env,
110 110
                                    PPCE500Params *params,
111
                                    target_phys_addr_t addr,
112
                                    target_phys_addr_t initrd_base,
113
                                    target_phys_addr_t initrd_size)
111
                                    hwaddr addr,
112
                                    hwaddr initrd_base,
113
                                    hwaddr initrd_size)
114 114
{
115 115
    int ret = -1;
116 116
    uint64_t mem_reg_property[] = { 0, cpu_to_be64(params->ram_size) };
......
346 346
}
347 347

  
348 348
/* Create -kernel TLB entries for BookE.  */
349
static inline target_phys_addr_t booke206_page_size_to_tlb(uint64_t size)
349
static inline hwaddr booke206_page_size_to_tlb(uint64_t size)
350 350
{
351 351
    return 63 - clz64(size >> 10);
352 352
}
......
355 355
{
356 356
    struct boot_info *bi = env->load_info;
357 357
    ppcmas_tlb_t *tlb = booke206_get_tlbm(env, 1, 0, 0);
358
    target_phys_addr_t size, dt_end;
358
    hwaddr size, dt_end;
359 359
    int ps;
360 360

  
361 361
    /* Our initial TLB entry needs to cover everything from 0 to
......
412 412
    CPUPPCState *env = NULL;
413 413
    uint64_t elf_entry;
414 414
    uint64_t elf_lowaddr;
415
    target_phys_addr_t entry=0;
416
    target_phys_addr_t loadaddr=UIMAGE_LOAD_BASE;
415
    hwaddr entry=0;
416
    hwaddr loadaddr=UIMAGE_LOAD_BASE;
417 417
    target_long kernel_size=0;
418 418
    target_ulong dt_base = 0;
419 419
    target_ulong initrd_base = 0;

Also available in: Unified diff