Skip to content
Snippets Groups Projects
Commit 58a70f16 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

cris: do not use ram_size global


Use the machine properties instead.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6e504a98
No related branches found
No related tags found
No related merge requests found
......@@ -333,6 +333,7 @@ void axisdev88_init(MachineState *machine)
if (kernel_filename) {
li.image_filename = kernel_filename;
li.cmdline = kernel_cmdline;
li.ram_size = machine->ram_size;
cris_load_image(cpu, &li);
} else if (!qtest_enabled()) {
fprintf(stderr, "Kernel image must be specified\n");
......
......@@ -81,7 +81,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
if (image_size < 0) {
/* Takes a kimage from the axis devboard SDK. */
image_size = load_image_targphys(li->image_filename, 0x40004000,
ram_size);
li->ram_size);
li->entry = 0x40004000;
}
......
......@@ -6,6 +6,7 @@ struct cris_load_info
const char *image_filename;
const char *cmdline;
int image_size;
ram_addr_t ram_size;
hwaddr entry;
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment