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 3DB6CC3A59B for ; Sat, 17 Aug 2019 10:21:56 +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 115B82064A for ; Sat, 17 Aug 2019 10:21:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 115B82064A 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]:35394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvqM-0003Cd-JJ for qemu-devel@archiver.kernel.org; Sat, 17 Aug 2019 06:21:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoU-0000r0-2z for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvoT-0004ZU-12 for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48544) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoQ-0004W2-Fl; Sat, 17 Aug 2019 06:19:54 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B1587800DD4; Sat, 17 Aug 2019 10:19:53 +0000 (UTC) Received: from thuth.com (ovpn-116-52.ams2.redhat.com [10.36.116.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D16583BA9; Sat, 17 Aug 2019 10:19:51 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:28 +0200 Message-Id: <20190817101931.28386-6-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Sat, 17 Aug 2019 10:19:53 +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] [PATCH v3 5/8] hw/core: Add a config switch for the "or-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: "Edgar E. Iglesias" , qemu-arm@nongnu.org, Mark Cave-Ayland , Artyom Tarasenko , Peter Maydell Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The "or-irq" device is only used by certain machines. Let's add a proper config switch for it so that it only gets compiled when we really need it. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/arm/Kconfig | 3 +++ hw/core/Kconfig | 3 +++ hw/core/Makefile.objs | 2 +- hw/pci-host/Kconfig | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ab65ecd216..849195c3f6 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -292,6 +292,7 @@ config RASPI config STM32F205_SOC bool select ARM_V7M + select OR_IRQ select STM32F2XX_TIMER select STM32F2XX_USART select STM32F2XX_SYSCFG @@ -360,6 +361,7 @@ config MPS2 select LAN9118 select MPS2_FPGAIO select MPS2_SCC + select OR_IRQ select PL022 # Serial port select PL080 # DMA controller =20 @@ -439,6 +441,7 @@ config ARMSSE select IOTKIT_SECCTL select IOTKIT_SYSCTL select IOTKIT_SYSINFO + select OR_IRQ select TZ_MPC select TZ_MSC select TZ_PPC diff --git a/hw/core/Kconfig b/hw/core/Kconfig index d11920fcb3..984143456a 100644 --- a/hw/core/Kconfig +++ b/hw/core/Kconfig @@ -7,6 +7,9 @@ config PTIMER config FITLOADER bool =20 +config OR_IRQ + bool + config PLATFORM_BUS bool =20 diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index d6cfb2a81b..ce337bd7c9 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -18,7 +18,7 @@ common-obj-$(CONFIG_SOFTMMU) +=3D loader.o 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_SOFTMMU) +=3D or-irq.o +common-obj-$(CONFIG_OR_IRQ) +=3D or-irq.o common-obj-$(CONFIG_SOFTMMU) +=3D split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) +=3D platform-bus.o common-obj-$(CONFIG_SOFTMMU) +=3D generic-loader.o diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 8c16d96b3f..1edc1a31d4 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -2,8 +2,9 @@ config PAM bool =20 config PREP_PCI - select PCI bool + select PCI + select OR_IRQ =20 config GRACKLE_PCI select PCI --=20 2.18.1