[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] armv7m: Don't put core v7M devices under CONF
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 08/11] armv7m: Don't put core v7M devices under CONFIG_STELLARIS |
Date: |
Mon, 20 Feb 2017 15:36:02 +0000 |
The NVIC is a core v7M device that exists for all v7M CPUs;
put it under a CONFIG_ARM_V7M rather than hiding it under
CONFIG_STELLARIS.
(We'll use CONFIG_ARM_V7M for the SysTick device too
when we split it out of the NVIC.)
Signed-off-by: Peter Maydell <address@hidden>
---
hw/intc/Makefile.objs | 2 +-
default-configs/arm-softmmu.mak | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs
index 8948106..adedd0d 100644
--- a/hw/intc/Makefile.objs
+++ b/hw/intc/Makefile.objs
@@ -24,7 +24,7 @@ obj-$(CONFIG_APIC) += apic.o apic_common.o
obj-$(CONFIG_ARM_GIC_KVM) += arm_gic_kvm.o
obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_kvm.o
obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) += arm_gicv3_its_kvm.o
-obj-$(CONFIG_STELLARIS) += armv7m_nvic.o
+obj-$(CONFIG_ARM_V7M) += armv7m_nvic.o
obj-$(CONFIG_EXYNOS4) += exynos4210_gic.o exynos4210_combiner.o
obj-$(CONFIG_GRLIB) += grlib_irqmp.o
obj-$(CONFIG_IOAPIC) += ioapic.o
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index fdf4089..1e3bd2b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -42,6 +42,8 @@ CONFIG_ARM11MPCORE=y
CONFIG_A9MPCORE=y
CONFIG_A15MPCORE=y
+CONFIG_ARM_V7M=y
+
CONFIG_ARM_GIC=y
CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
CONFIG_ARM_TIMER=y
--
2.7.4
- [Qemu-devel] [PATCH 09/11] armv7m: Split systick out from NVIC, (continued)
- [Qemu-devel] [PATCH 09/11] armv7m: Split systick out from NVIC, Peter Maydell, 2017/02/20
- [Qemu-devel] [PATCH 03/11] armv7m: QOMify the armv7m container, Peter Maydell, 2017/02/20
- [Qemu-devel] [PATCH 07/11] armv7m: Make bitband device take the address space to access, Peter Maydell, 2017/02/20
- [Qemu-devel] [PATCH 08/11] armv7m: Don't put core v7M devices under CONFIG_STELLARIS,
Peter Maydell <=
- [Qemu-devel] [PATCH 02/11] armv7m: Move NVICState struct definition into header, Peter Maydell, 2017/02/20
- [Qemu-devel] [PATCH 04/11] armv7m: Use QOMified armv7m object in armv7m_init(), Peter Maydell, 2017/02/20