From 1328cc01f18b416666cdc65c72efec33a6dce396 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Fri, 4 May 2012 19:03:24 +0200 Subject: [PATCH] milkymist: Use cpu_lm32_init() to obtain LM32CPU MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Needed for main_cpu_reset(). Signed-off-by: Andreas Färber Acked-by: Michael Walle --- hw/milkymist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/milkymist.c b/hw/milkymist.c index 8bb6a97..59f37b4 100644 --- a/hw/milkymist.c +++ b/hw/milkymist.c @@ -79,6 +79,7 @@ milkymist_init(ram_addr_t ram_size_not_used, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { + LM32CPU *cpu; CPULM32State *env; int kernel_size; DriveInfo *dinfo; @@ -105,7 +106,8 @@ milkymist_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; cpu_lm32_set_phys_msb_ignore(env, 1); -- 2.7.4