david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lm32_boards: Use cpu_lm32_init() to obtain LM32CPU

Browse Source 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
This commit is contained in:
Andreas Färber 2012-05-04 18:55:25 +02:00
parent 0347d689f7
commit 47dc4fa211
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/lm32_boards.c
View File

@ -75,6 +75,7 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
LM32CPU *cpu;
CPULM32State *env; CPULM32State *env;
DriveInfo *dinfo; DriveInfo *dinfo;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
@ -101,7 +102,8 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used,
if (cpu_model == NULL) { if (cpu_model == NULL) {
cpu_model = "lm32-full"; cpu_model = "lm32-full";
} }
env = cpu_init(cpu_model); cpu = cpu_lm32_init(cpu_model);
env = &cpu->env;
reset_info->env = env; reset_info->env = env;
reset_info->flash_base = flash_base; reset_info->flash_base = flash_base;
@ -163,6 +165,7 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used,
const char *kernel_cmdline, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) const char *initrd_filename, const char *cpu_model)
{ {
LM32CPU *cpu;
CPULM32State *env; CPULM32State *env;
DriveInfo *dinfo; DriveInfo *dinfo;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
@ -196,7 +199,8 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used,
if (cpu_model == NULL) { if (cpu_model == NULL) {
cpu_model = "lm32-full"; cpu_model = "lm32-full";
} }
env = cpu_init(cpu_model); cpu = cpu_lm32_init(cpu_model);
env = &cpu->env;
reset_info->env = env; reset_info->env = env;
reset_info->flash_base = flash_base; reset_info->flash_base = flash_base;