Revision a8170e5e hw/ppc440_bamboo.c

b/hw/ppc440_bamboo.c
49 49
    256<<20, 128<<20, 64<<20, 32<<20, 16<<20, 8<<20, 0
50 50
};
51 51

  
52
static target_phys_addr_t entry;
52
static hwaddr entry;
53 53

  
54
static int bamboo_load_device_tree(target_phys_addr_t addr,
54
static int bamboo_load_device_tree(hwaddr addr,
55 55
                                     uint32_t ramsize,
56
                                     target_phys_addr_t initrd_base,
57
                                     target_phys_addr_t initrd_size,
56
                                     hwaddr initrd_base,
57
                                     hwaddr initrd_size,
58 58
                                     const char *kernel_cmdline)
59 59
{
60 60
    int ret = -1;
......
123 123
/* Create reset TLB entries for BookE, spanning the 32bit addr space.  */
124 124
static void mmubooke_create_initial_mapping(CPUPPCState *env,
125 125
                                     target_ulong va,
126
                                     target_phys_addr_t pa)
126
                                     hwaddr pa)
127 127
{
128 128
    ppcemb_tlb_t *tlb = &env->tlb.tlbe[0];
129 129

  
......
168 168
    MemoryRegion *address_space_mem = get_system_memory();
169 169
    MemoryRegion *ram_memories
170 170
        = g_malloc(PPC440EP_SDRAM_NR_BANKS * sizeof(*ram_memories));
171
    target_phys_addr_t ram_bases[PPC440EP_SDRAM_NR_BANKS];
172
    target_phys_addr_t ram_sizes[PPC440EP_SDRAM_NR_BANKS];
171
    hwaddr ram_bases[PPC440EP_SDRAM_NR_BANKS];
172
    hwaddr ram_sizes[PPC440EP_SDRAM_NR_BANKS];
173 173
    qemu_irq *pic;
174 174
    qemu_irq *irqs;
175 175
    PCIBus *pcibus;
......
177 177
    CPUPPCState *env;
178 178
    uint64_t elf_entry;
179 179
    uint64_t elf_lowaddr;
180
    target_phys_addr_t loadaddr = 0;
180
    hwaddr loadaddr = 0;
181 181
    target_long initrd_size = 0;
182 182
    DeviceState *dev;
183 183
    int success;

Also available in: Unified diff