Revision ca20cf32 hw/dummy_m68k.c
b/hw/dummy_m68k.c | ||
---|---|---|
9 | 9 |
#include "hw.h" |
10 | 10 |
#include "sysemu.h" |
11 | 11 |
#include "boards.h" |
12 |
#include "loader.h" |
|
13 |
#include "elf.h" |
|
12 | 14 |
|
13 | 15 |
#define KERNEL_LOAD_ADDR 0x10000 |
14 | 16 |
|
... | ... | |
22 | 24 |
CPUState *env; |
23 | 25 |
int kernel_size; |
24 | 26 |
uint64_t elf_entry; |
25 |
target_ulong entry;
|
|
27 |
target_phys_addr_t entry;
|
|
26 | 28 |
|
27 | 29 |
if (!cpu_model) |
28 | 30 |
cpu_model = "cfv4e"; |
... | ... | |
41 | 43 |
|
42 | 44 |
/* Load kernel. */ |
43 | 45 |
if (kernel_filename) { |
44 |
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL); |
|
46 |
kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL, |
|
47 |
1, ELF_MACHINE, 0); |
|
45 | 48 |
entry = elf_entry; |
46 | 49 |
if (kernel_size < 0) { |
47 | 50 |
kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL); |
Also available in: Unified diff