From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hQUF0-0006pP-A3 for mharc-qemu-trivial@gnu.org; Tue, 14 May 2019 06:00:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQUEu-0006gA-3n for qemu-trivial@nongnu.org; Tue, 14 May 2019 06:00:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQUEo-000431-Ko for qemu-trivial@nongnu.org; Tue, 14 May 2019 06:00:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQUEf-0003g7-A4; Tue, 14 May 2019 06:00:37 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B987309B151; Tue, 14 May 2019 10:00:36 +0000 (UTC) Received: from thuth.com (ovpn-116-85.ams2.redhat.com [10.36.116.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id B80445C207; Tue, 14 May 2019 10:00:32 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-trivial@nongnu.org, philmd@redhat.com Date: Tue, 14 May 2019 12:00:17 +0200 Message-Id: <20190514100019.13263-3-thuth@redhat.com> In-Reply-To: <20190514100019.13263-1-thuth@redhat.com> References: <20190514100019.13263-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 14 May 2019 10:00:36 +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-trivial] [PATCH 2/4] hw/core: Add a config switch for the "or-irq" device X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 May 2019 10:00:57 -0000 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. Signed-off-by: Thomas Huth --- hw/arm/Kconfig | 2 ++ hw/core/Kconfig | 3 +++ hw/core/Makefile.objs | 2 +- hw/pci-host/Kconfig | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index af8cffde9c..0bb3bbe9d3 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -277,6 +277,7 @@ config RASPI config STM32F205_SOC bool select ARM_V7M + select OR_IRQ select STM32F2XX_TIMER select STM32F2XX_USART select STM32F2XX_SYSCFG @@ -424,6 +425,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 d493a051ee..dd2c2ca812 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -17,7 +17,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.21.0