From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D63AEC3A589 for ; Tue, 20 Aug 2019 08:05:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABE4323955 for ; Tue, 20 Aug 2019 08:05:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABE4323955 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzyvj-0004oU-7U for qemu-devel@archiver.kernel.org; Tue, 20 Aug 2019 03:51:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzysC-00085B-Ow for qemu-devel@nongnu.org; Tue, 20 Aug 2019 03:48:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzysB-0004Td-LQ for qemu-devel@nongnu.org; Tue, 20 Aug 2019 03:48:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60382) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzysB-0004TF-CV for qemu-devel@nongnu.org; Tue, 20 Aug 2019 03:48:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7D5C3001BF1; Tue, 20 Aug 2019 07:48:06 +0000 (UTC) Received: from thuth.com (ovpn-116-232.ams2.redhat.com [10.36.116.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99254100195C; Tue, 20 Aug 2019 07:48:05 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Tue, 20 Aug 2019 09:47:47 +0200 Message-Id: <20190820074749.25208-7-thuth@redhat.com> In-Reply-To: <20190820074749.25208-1-thuth@redhat.com> References: <20190820074749.25208-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 20 Aug 2019 07:48:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/8] hw/core: Add a config switch for the "split-irq" device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The "split-irq" device is currently only used by machines that use CONFIG_ARMSSE. Let's add a proper CONFIG_SPLIT_IRQ switch for this so that it only gets compiled when we really need it. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190817101931.28386-7-thuth@redhat.com> Signed-off-by: Thomas Huth --- hw/arm/Kconfig | 3 +++ hw/core/Kconfig | 3 +++ hw/core/Makefile.objs | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 849195c3f6..6e24c73b54 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -81,6 +81,7 @@ config MUSCA select ARMSSE select PL011 select PL031 + select SPLIT_IRQ =20 config MUSICPAL bool @@ -364,6 +365,7 @@ config MPS2 select OR_IRQ select PL022 # Serial port select PL080 # DMA controller + select SPLIT_IRQ =20 config FSL_IMX7 bool @@ -442,6 +444,7 @@ config ARMSSE select IOTKIT_SYSCTL select IOTKIT_SYSINFO select OR_IRQ + select SPLIT_IRQ select TZ_MPC select TZ_MSC select TZ_PPC diff --git a/hw/core/Kconfig b/hw/core/Kconfig index 984143456a..fffb3d62b2 100644 --- a/hw/core/Kconfig +++ b/hw/core/Kconfig @@ -15,3 +15,6 @@ config PLATFORM_BUS =20 config REGISTER bool + +config SPLIT_IRQ + bool diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index ce337bd7c9..bb1afe422a 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -19,7 +19,7 @@ common-obj-$(CONFIG_FITLOADER) +=3D loader-fit.o common-obj-$(CONFIG_SOFTMMU) +=3D qdev-properties-system.o common-obj-$(CONFIG_REGISTER) +=3D register.o common-obj-$(CONFIG_OR_IRQ) +=3D or-irq.o -common-obj-$(CONFIG_SOFTMMU) +=3D split-irq.o +common-obj-$(CONFIG_SPLIT_IRQ) +=3D split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) +=3D platform-bus.o common-obj-$(CONFIG_SOFTMMU) +=3D generic-loader.o common-obj-$(CONFIG_SOFTMMU) +=3D null-machine.o --=20 2.18.1