Revision e16ad5b0 hw/mips_malta.c
b/hw/mips_malta.c | ||
---|---|---|
683 | 683 |
} |
684 | 684 |
|
685 | 685 |
/* Kernel */ |
686 |
static int64_t load_kernel (CPUState *env)
|
|
686 |
static int64_t load_kernel (void)
|
|
687 | 687 |
{ |
688 | 688 |
int64_t kernel_entry, kernel_low, kernel_high; |
689 | 689 |
int index = 0; |
... | ... | |
758 | 758 |
location does not change. */ |
759 | 759 |
if (loaderparams.kernel_filename) { |
760 | 760 |
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL)); |
761 |
load_kernel (env); |
|
762 | 761 |
} |
763 | 762 |
} |
764 | 763 |
|
... | ... | |
843 | 842 |
loaderparams.kernel_filename = kernel_filename; |
844 | 843 |
loaderparams.kernel_cmdline = kernel_cmdline; |
845 | 844 |
loaderparams.initrd_filename = initrd_filename; |
846 |
kernel_entry = load_kernel(env); |
|
847 |
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL)); |
|
845 |
kernel_entry = load_kernel(); |
|
848 | 846 |
write_bootloader(env, qemu_get_ram_ptr(bios_offset), kernel_entry); |
849 | 847 |
} else { |
850 | 848 |
dinfo = drive_get(IF_PFLASH, 0, fl_idx); |
Also available in: Unified diff