diff options
| author | Paul Brook | 2009-06-04 14:12:05 +0200 |
|---|---|---|
| committer | Paul Brook | 2009-06-04 14:12:05 +0200 |
| commit | bdb11366b9370e97fb436444c697c01fe839dc11 (patch) | |
| tree | 029aadb55bb219df61dc353e89f38c16629df0a7 /hw/armv7m_nvic.c | |
| parent | Add --enable-debug (diff) | |
| download | qemu-bdb11366b9370e97fb436444c697c01fe839dc11.tar.gz qemu-bdb11366b9370e97fb436444c697c01fe839dc11.tar.xz qemu-bdb11366b9370e97fb436444c697c01fe839dc11.zip | |
Remove ARM NVIC initialization hack
The ARMv7-M NVIC device pokes itself into the CPU state. Now we have a
proper device model we can have the CPU/SoC code do this.
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/armv7m_nvic.c')
| -rw-r--r-- | hw/armv7m_nvic.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index 2a948ac346..f789c785fd 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -393,15 +393,10 @@ static int nvic_load(QEMUFile *f, void *opaque, int version_id) static void armv7m_nvic_init(SysBusDevice *dev) { nvic_state *s= FROM_SYSBUSGIC(nvic_state, dev); - CPUState *env; - env = qdev_get_prop_ptr(&dev->qdev, "cpu"); gic_init(&s->gic); cpu_register_physical_memory(0xe000e000, 0x1000, s->gic.iomemtype); s->systick.timer = qemu_new_timer(vm_clock, systick_timer_tick, s); - if (env->v7m.nvic) - hw_error("CPU can only have one NVIC\n"); - env->v7m.nvic = s; register_savevm("armv7m_nvic", -1, 1, nvic_save, nvic_load, s); } |