diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 18:55:25 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:41 +0200 |
| commit | 47dc4fa211aa3eaf408c9af521dcb3ad8e98ab65 (patch) | |
| tree | 762b49672760f1cfeeccc0e624c02b00b5fee177 /hw/lm32_boards.c | |
| parent | 0347d689f7339ec925f3a2dcb2c3bcad4d6ef315 (diff) | |
| download | qemu-47dc4fa211aa3eaf408c9af521dcb3ad8e98ab65.tar.gz | |
lm32_boards: Use cpu_lm32_init() to obtain LM32CPU
Needed for main_cpu_reset().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
Diffstat (limited to 'hw/lm32_boards.c')
| -rw-r--r-- | hw/lm32_boards.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c index 4dd4f0ab90..ffb273cbf5 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32_boards.c @@ -75,6 +75,7 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { + LM32CPU *cpu; CPULM32State *env; DriveInfo *dinfo; 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) { cpu_model = "lm32-full"; } - env = cpu_init(cpu_model); + cpu = cpu_lm32_init(cpu_model); + env = &cpu->env; reset_info->env = env; 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 *initrd_filename, const char *cpu_model) { + LM32CPU *cpu; CPULM32State *env; DriveInfo *dinfo; 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) { cpu_model = "lm32-full"; } - env = cpu_init(cpu_model); + cpu = cpu_lm32_init(cpu_model); + env = &cpu->env; reset_info->env = env; reset_info->flash_base = flash_base; |