[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/74] armv7m: Use cpu_arm_init() to obtain ARMCPU
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 04/74] armv7m: Use cpu_arm_init() to obtain ARMCPU |
Date: |
Tue, 5 Jun 2012 03:21:36 +0200 |
Needed for armv7m_reset().
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Peter Maydell <address@hidden>
---
hw/armv7m.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/armv7m.c b/hw/armv7m.c
index 4aac076..4e5971c 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -160,6 +160,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
int flash_size, int sram_size,
const char *kernel_filename, const char *cpu_model)
{
+ ARMCPU *cpu;
CPUARMState *env;
DeviceState *nvic;
/* FIXME: make this local state. */
@@ -177,13 +178,15 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
flash_size *= 1024;
sram_size *= 1024;
- if (!cpu_model)
+ if (cpu_model == NULL) {
cpu_model = "cortex-m3";
- env = cpu_init(cpu_model);
- if (!env) {
+ }
+ cpu = cpu_arm_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
+ env = &cpu->env;
#if 0
/* > 32Mb SRAM gets complicated because it overlaps the bitband area.
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState, part 3: cpu_state_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 02/74] pxa2xx: Use cpu_arm_init() and store ARMCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 01/74] target-arm: Use cpu_reset() in cpu_arm_init(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 04/74] armv7m: Use cpu_arm_init() to obtain ARMCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH 05/74] armv7m: Pass ARMCPU to armv7m_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 06/74] arm_boot: Pass ARMCPU to do_cpu_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 03/74] omap: Use cpu_arm_init() to store ARMCPU in omap_mpu_state_s, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 07/74] target-lm32: Let cpu_lm32_init() return LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 08/74] lm32_boards: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 09/74] lm32_boards: Store LM32CPU in ResetInfo, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 10/74] milkymist: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 11/74] milkymist: Store LM32 in ResetInfo, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 12/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 15/74] xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/06/04