Revision ca20cf32 hw/ppc440_bamboo.c

b/hw/ppc440_bamboo.c
22 22
#include "kvm.h"
23 23
#include "kvm_ppc.h"
24 24
#include "device_tree.h"
25
#include "loader.h"
26
#include "elf.h"
25 27

  
26 28
#define BINARY_DEVICE_TREE_FILE "bamboo.dtb"
27 29

  
......
93 95
    CPUState *env;
94 96
    uint64_t elf_entry;
95 97
    uint64_t elf_lowaddr;
96
    target_ulong entry = 0;
97
    target_ulong loadaddr = 0;
98
    target_phys_addr_t entry = 0;
99
    target_phys_addr_t loadaddr = 0;
98 100
    target_long kernel_size = 0;
99 101
    target_ulong initrd_base = 0;
100 102
    target_long initrd_size = 0;
......
126 128
        kernel_size = load_uimage(kernel_filename, &entry, &loadaddr, NULL);
127 129
        if (kernel_size < 0) {
128 130
            kernel_size = load_elf(kernel_filename, 0, &elf_entry, &elf_lowaddr,
129
                                   NULL);
131
                                   NULL, 1, ELF_MACHINE, 0);
130 132
            entry = elf_entry;
131 133
            loadaddr = elf_lowaddr;
132 134
        }

Also available in: Unified diff