Revision ca20cf32 hw/ppce500_mpc8544ds.c

b/hw/ppce500_mpc8544ds.c
29 29
#include "device_tree.h"
30 30
#include "openpic.h"
31 31
#include "ppce500.h"
32
#include "loader.h"
33
#include "elf.h"
32 34

  
33 35
#define BINARY_DEVICE_TREE_FILE    "mpc8544ds.dtb"
34 36
#define UIMAGE_LOAD_BASE           0
......
160 162
    CPUState *env;
161 163
    uint64_t elf_entry;
162 164
    uint64_t elf_lowaddr;
163
    target_ulong entry=0;
164
    target_ulong loadaddr=UIMAGE_LOAD_BASE;
165
    target_phys_addr_t entry=0;
166
    target_phys_addr_t loadaddr=UIMAGE_LOAD_BASE;
165 167
    target_long kernel_size=0;
166 168
    target_ulong dt_base=DTB_LOAD_BASE;
167 169
    target_ulong initrd_base=INITRD_LOAD_BASE;
......
226 228
        kernel_size = load_uimage(kernel_filename, &entry, &loadaddr, NULL);
227 229
        if (kernel_size < 0) {
228 230
            kernel_size = load_elf(kernel_filename, 0, &elf_entry, &elf_lowaddr,
229
                                   NULL);
231
                                   NULL, 1, ELF_MACHINE, 0);
230 232
            entry = elf_entry;
231 233
            loadaddr = elf_lowaddr;
232 234
        }

Also available in: Unified diff