OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cris-boot: Pass CRISCPU to cris_load_image()

Browse Source 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Andreas Färber 2012-05-05 11:57:07 +02:00
parent ddeb9ae5fa
commit 5935664fc0
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/axis_dev88.c
View File

@ -346,7 +346,7 @@ void axisdev88_init (ram_addr_t ram_size,
li.image_filename = kernel_filename; li.image_filename = kernel_filename;
li.cmdline = kernel_cmdline; li.cmdline = kernel_cmdline;
cris_load_image(env, &li); cris_load_image(cpu, &li);
} }
static QEMUMachine axisdev88_machine = { static QEMUMachine axisdev88_machine = {

3
hw/cris-boot.c
View File

@ -60,8 +60,9 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
return addr - 0x80000000LL; return addr - 0x80000000LL;
} }
void cris_load_image(CPUCRISState *env, struct cris_load_info *li) void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
{ {
CPUCRISState *env = &cpu->env;
uint64_t entry, high; uint64_t entry, high;
int kcmdline_len; int kcmdline_len;
int image_size; int image_size;

2
hw/cris-boot.h
View File

@ -8,4 +8,4 @@ struct cris_load_info
target_phys_addr_t entry; target_phys_addr_t entry;
}; };
void cris_load_image(CPUCRISState *env, struct cris_load_info *li); void cris_load_image(CRISCPU *cpu, struct cris_load_info *li);