Message ID | 1487604965-23220-9-git-send-email-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | ARMv7M: QOMify | expand |
On 02/20/2017 12:36 PM, Peter Maydell wrote: > 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 <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > 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 >
Peter Maydell <peter.maydell@linaro.org> writes: > 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 <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > 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 -- Alex Bennée
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
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 <peter.maydell@linaro.org> --- hw/intc/Makefile.objs | 2 +- default-configs/arm-softmmu.mak | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.7.4