From nobody Wed Feb 11 03:26:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487606200707629.1228063178391; Mon, 20 Feb 2017 07:56:40 -0800 (PST) Received: from localhost ([::1]:39392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfqKM-0007XZ-TG for importer@patchew.org; Mon, 20 Feb 2017 10:56:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cfq0k-0006ca-KO for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:36:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cfq0j-0003Q5-Qw for qemu-devel@nongnu.org; Mon, 20 Feb 2017 10:36:22 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:48583) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cfq0g-0003Lw-AS; Mon, 20 Feb 2017 10:36:18 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1cfq0Y-0005iB-MI; Mon, 20 Feb 2017 15:36:10 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 20 Feb 2017 15:36:02 +0000 Message-Id: <1487604965-23220-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487604965-23220-1-git-send-email-peter.maydell@linaro.org> References: <1487604965-23220-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 08/11] armv7m: Don't put core v7M devices under CONFIG_STELLARIS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Francis , Michael Davidsaver , =?UTF-8?q?Alex=20Benn=C3=A9e?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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) +=3D apic.o apic_common.o obj-$(CONFIG_ARM_GIC_KVM) +=3D arm_gic_kvm.o obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) +=3D arm_gicv3_kv= m.o obj-$(call land,$(CONFIG_ARM_GIC_KVM),$(TARGET_AARCH64)) +=3D arm_gicv3_it= s_kvm.o -obj-$(CONFIG_STELLARIS) +=3D armv7m_nvic.o +obj-$(CONFIG_ARM_V7M) +=3D armv7m_nvic.o obj-$(CONFIG_EXYNOS4) +=3D exynos4210_gic.o exynos4210_combiner.o obj-$(CONFIG_GRLIB) +=3D grlib_irqmp.o obj-$(CONFIG_IOAPIC) +=3D 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=3Dy CONFIG_A9MPCORE=3Dy CONFIG_A15MPCORE=3Dy =20 +CONFIG_ARM_V7M=3Dy + CONFIG_ARM_GIC=3Dy CONFIG_ARM_GIC_KVM=3D$(CONFIG_KVM) CONFIG_ARM_TIMER=3Dy --=20 2.7.4