Clear BEV and ERL for the fake bootloader.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2609 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
bf9525e9d8
commit
fb82fea064
@ -654,8 +654,10 @@ static void main_cpu_reset(void *opaque)
|
|||||||
/* The bootload does not need to be rewritten as it is located in a
|
/* The bootload does not need to be rewritten as it is located in a
|
||||||
read only location. The kernel location and the arguments table
|
read only location. The kernel location and the arguments table
|
||||||
location does not change. */
|
location does not change. */
|
||||||
if (env->kernel_filename)
|
if (env->kernel_filename) {
|
||||||
|
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
|
||||||
load_kernel (env);
|
load_kernel (env);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
@ -709,6 +711,7 @@ void mips_malta_init (int ram_size, int vga_ram_size, int boot_device,
|
|||||||
env->kernel_cmdline = kernel_cmdline;
|
env->kernel_cmdline = kernel_cmdline;
|
||||||
env->initrd_filename = initrd_filename;
|
env->initrd_filename = initrd_filename;
|
||||||
kernel_entry = load_kernel(env);
|
kernel_entry = load_kernel(env);
|
||||||
|
env->CP0_Status &= ~((1 << CP0St_BEV) | (1 << CP0St_ERL));
|
||||||
write_bootloader(env, bios_offset, kernel_entry);
|
write_bootloader(env, bios_offset, kernel_entry);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
|
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
|
||||||
|
Loading…
Reference in New Issue
Block a user