From patchwork Sat Aug 17 10:19:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469bqT4Jbnz9s00 for ; Sat, 17 Aug 2019 20:23:01 +1000 (AEST) Received: from localhost ([::1]:35404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvrP-0004fJ-A4 for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:22:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58045) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoJ-0000hd-2n for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvoI-0004Pc-4W for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoF-0004Mw-OR; Sat, 17 Aug 2019 06:19:43 -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 1380B36955; Sat, 17 Aug 2019 10:19:43 +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 A996FD1E5; Sat, 17 Aug 2019 10:19:40 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:24 +0200 Message-Id: <20190817101931.28386-2-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 17 Aug 2019 10:19:43 +0000 (UTC) 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 1/8] hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The XLNX_ZYNQMP config is used in multiple subdirectories (timer, intc). Move it to the root hw/Kconfig. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190427141459.19728-2-philmd@redhat.com> Reviewed-by: Alistair Francis Signed-off-by: Thomas Huth --- hw/Kconfig | 3 +++ hw/timer/Kconfig | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/Kconfig b/hw/Kconfig index 195f541e50..dbae1c0852 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -73,3 +73,6 @@ config XILINX config XILINX_AXI bool select PTIMER # for hw/dma/xilinx_axidma.c + +config XLNX_ZYNQMP + bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 51921eb63f..eefc95f35e 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -34,9 +34,6 @@ config TWL92230 bool depends on I2C -config XLNX_ZYNQMP - bool - config ALTERA_TIMER bool select PTIMER From patchwork Sat Aug 17 10:19:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469bmy3sRgz9s00 for ; Sat, 17 Aug 2019 20:20:48 +1000 (AEST) Received: from localhost ([::1]:35340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvpF-0000sS-49 for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:20:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58094) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoO-0000mY-Iu for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvoM-0004T5-Hu for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59776) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoJ-0004PQ-1c; Sat, 17 Aug 2019 06:19:47 -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 B3E7C1951D54; Sat, 17 Aug 2019 10:19:45 +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 703ADD1E5; Sat, 17 Aug 2019 10:19:43 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:25 +0200 Message-Id: <20190817101931.28386-3-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> MIME-Version: 1.0 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.62]); Sat, 17 Aug 2019 10:19:45 +0000 (UTC) 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 2/8] hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The Xilinx I/O Module Interrupt Controller is only used by the MicroBlaze PMU, not by the AArch64 machine. Move it from the generic ZynqMP object list to the PMU specific. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190427141459.19728-3-philmd@redhat.com> Reviewed-by: Thomas Huth Reviewed-by: Alistair Francis Signed-off-by: Thomas Huth --- hw/intc/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 03019b9a03..f726d87532 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o common-obj-$(CONFIG_PL190) += pl190.o common-obj-$(CONFIG_PUV3) += puv3_intc.o common-obj-$(CONFIG_XILINX) += xilinx_intc.o -common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o +common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o From patchwork Sat Aug 17 10:19:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148693 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469bnT0v1hz9s00 for ; Sat, 17 Aug 2019 20:21:17 +1000 (AEST) Received: from localhost ([::1]:35386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvpi-0001UU-Jp for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:21:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58117) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoP-0000mz-JM for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvoO-0004Um-I8 for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34102) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoM-0004RN-5w; Sat, 17 Aug 2019 06:19:50 -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 5E429C049D59; Sat, 17 Aug 2019 10:19:48 +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 1DF0FD1E5; Sat, 17 Aug 2019 10:19:45 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:26 +0200 Message-Id: <20190817101931.28386-4-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sat, 17 Aug 2019 10:19:48 +0000 (UTC) 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 3/8] hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The xlnx_dpdma device is only used by the ZynqMP AArch64 machine (not the MicroBlaze PMU). Remove it from the ZynqMP generic objects. (Note, this entry was duplicated for the AArch64). Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190427141459.19728-4-philmd@redhat.com> Reviewed-by: Thomas Huth Reviewed-by: Alistair Francis Signed-off-by: Thomas Huth --- hw/dma/Makefile.objs | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs index 8b39f9c600..b672e7a522 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o common-obj-$(CONFIG_STP2000) += sparc32_dma.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o From patchwork Sat Aug 17 10:19:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148697 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469bsn3YhYz9s00 for ; Sat, 17 Aug 2019 20:25:01 +1000 (AEST) Received: from localhost ([::1]:35434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvtL-0007Yx-Ei for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:24:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58147) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoR-0000om-Mi for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvoQ-0004Wh-M0 for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:19:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoO-0004Tm-H6; Sat, 17 Aug 2019 06:19:52 -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 101683083394; Sat, 17 Aug 2019 10:19:51 +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 BF21BD1E5; Sat, 17 Aug 2019 10:19:48 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:27 +0200 Message-Id: <20190817101931.28386-5-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Sat, 17 Aug 2019 10:19:51 +0000 (UTC) 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 4/8] hw/core: Add a config switch for the "register" 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The "register" 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/Kconfig | 1 + hw/core/Kconfig | 3 +++ hw/core/Makefile.objs | 2 +- hw/dma/Kconfig | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/Kconfig b/hw/Kconfig index dbae1c0852..b45db3c813 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -76,3 +76,4 @@ config XILINX_AXI config XLNX_ZYNQMP bool + select REGISTER diff --git a/hw/core/Kconfig b/hw/core/Kconfig index c2a1ae8122..d11920fcb3 100644 --- a/hw/core/Kconfig +++ b/hw/core/Kconfig @@ -9,3 +9,6 @@ config FITLOADER config PLATFORM_BUS bool + +config REGISTER + bool diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index f8481d959f..d6cfb2a81b 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -17,7 +17,7 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_FITLOADER) += loader-fit.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o -common-obj-$(CONFIG_SOFTMMU) += register.o +common-obj-$(CONFIG_REGISTER) += register.o common-obj-$(CONFIG_SOFTMMU) += or-irq.o common-obj-$(CONFIG_SOFTMMU) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index 751dec5426..5c61b67bc0 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -16,6 +16,7 @@ config I8257 config ZYNQ_DEVCFG bool + select REGISTER config STP2000 bool From patchwork Sat Aug 17 10:19:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469bnN0y5kz9s00 for ; Sat, 17 Aug 2019 20:21:12 +1000 (AEST) Received: from localhost ([::1]:35384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvpd-0001Jh-Lu for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:21:09 -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_Mathieu-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 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) 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+incoming=patchwork.ozlabs.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é 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 @@ -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 +config OR_IRQ + bool + config PLATFORM_BUS bool 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) += loader.o common-obj-$(CONFIG_FITLOADER) += loader-fit.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_REGISTER) += register.o -common-obj-$(CONFIG_SOFTMMU) += or-irq.o +common-obj-$(CONFIG_OR_IRQ) += or-irq.o common-obj-$(CONFIG_SOFTMMU) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o common-obj-$(CONFIG_SOFTMMU) += 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 config PREP_PCI - select PCI bool + select PCI + select OR_IRQ config GRACKLE_PCI select PCI From patchwork Sat Aug 17 10:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469bqr6Vmrz9sDB for ; Sat, 17 Aug 2019 20:23:20 +1000 (AEST) Received: from localhost ([::1]:35416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvri-0005Cn-La for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:23:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58200) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoZ-0000zp-AH for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:20:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvoY-0004fS-7z for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:20:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47520) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoV-0004bl-VH; Sat, 17 Aug 2019 06:20:00 -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 4091281F0F; Sat, 17 Aug 2019 10:19:59 +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 B5569D1E5; Sat, 17 Aug 2019 10:19:53 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:29 +0200 Message-Id: <20190817101931.28386-7-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sat, 17 Aug 2019 10:19:59 +0000 (UTC) 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 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: "Edgar E. Iglesias" , qemu-arm@nongnu.org, Mark Cave-Ayland , Artyom Tarasenko , Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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é 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 config MUSICPAL bool @@ -364,6 +365,7 @@ config MPS2 select OR_IRQ select PL022 # Serial port select PL080 # DMA controller + select SPLIT_IRQ 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 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) += loader-fit.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_REGISTER) += register.o common-obj-$(CONFIG_OR_IRQ) += or-irq.o -common-obj-$(CONFIG_SOFTMMU) += split-irq.o +common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o common-obj-$(CONFIG_SOFTMMU) += generic-loader.o common-obj-$(CONFIG_SOFTMMU) += null-machine.o From patchwork Sat Aug 17 10:19:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469br40CTlz9s00 for ; Sat, 17 Aug 2019 20:23:32 +1000 (AEST) Received: from localhost ([::1]:35422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvrt-0005YR-NW for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:23:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58228) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoc-00015I-CS for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvob-0004iY-78 for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:20:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvoY-0004fP-Mz; Sat, 17 Aug 2019 06:20:02 -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 E53A3301E13E; Sat, 17 Aug 2019 10:20:01 +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 9BD6BD1E5; Sat, 17 Aug 2019 10:19:59 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:30 +0200 Message-Id: <20190817101931.28386-8-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Sat, 17 Aug 2019 10:20:02 +0000 (UTC) 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 7/8] hw/misc: Add a config switch for the "unimplemented" 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The device is only used by some few boards. Let's use a proper Kconfig switch so that we only compile this code if we really need it. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/Kconfig | 11 +++++++++++ hw/microblaze/Kconfig | 1 + hw/misc/Kconfig | 3 +++ hw/misc/Makefile.objs | 2 +- hw/sparc64/Kconfig | 1 + 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 6e24c73b54..76a2a6bcbf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -82,6 +82,7 @@ config MUSCA select PL011 select PL031 select SPLIT_IRQ + select UNIMP config MUSICPAL bool @@ -217,6 +218,7 @@ config STELLARIS select SSI_SD select STELLARIS_INPUT select STELLARIS_ENET # ethernet + select UNIMP config STRONGARM bool @@ -283,6 +285,7 @@ config ALLWINNER_A10 select ALLWINNER_A10_PIC select ALLWINNER_EMAC select SERIAL + select UNIMP config RASPI bool @@ -320,6 +323,7 @@ config XLNX_VERSAL select PL011 select CADENCE select VIRTIO_MMIO + select UNIMP config FSL_IMX25 bool @@ -355,6 +359,7 @@ config ASPEED_SOC select SSI_M25P80 select TMP105 select TMP421 + select UNIMP config MPS2 bool @@ -366,6 +371,7 @@ config MPS2 select PL022 # Serial port select PL080 # DMA controller select SPLIT_IRQ + select UNIMP config FSL_IMX7 bool @@ -378,6 +384,7 @@ config FSL_IMX7 select IMX_I2C select PCI_EXPRESS_DESIGNWARE select SDHCI + select UNIMP config ARM_SMMUV3 bool @@ -389,6 +396,7 @@ config FSL_IMX6UL select IMX_FEC select IMX_I2C select SDHCI + select UNIMP config MICROBIT bool @@ -398,6 +406,7 @@ config NRF51_SOC bool select I2C select ARM_V7M + select UNIMP config EMCRAFT_SF2 bool @@ -410,6 +419,7 @@ config MSF2 select PTIMER select SERIAL select SSI + select UNIMP config ZAURUS bool @@ -448,6 +458,7 @@ config ARMSSE select TZ_MPC select TZ_MSC select TZ_PPC + select UNIMP config ARMSSE_CPUID bool diff --git a/hw/microblaze/Kconfig b/hw/microblaze/Kconfig index c4dc120973..e2697ced9c 100644 --- a/hw/microblaze/Kconfig +++ b/hw/microblaze/Kconfig @@ -4,6 +4,7 @@ config PETALOGIX_S3ADSP1800 select XILINX select XILINX_AXI select XILINX_ETHLITE + select UNIMP config PETALOGIX_ML605 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 385e1b0cec..51754bb47c 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -117,4 +117,7 @@ config AUX bool select I2C +config UNIMP + bool + source macio/Kconfig diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index e9aab519a1..e4aad707fb 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o common-obj-$(CONFIG_EDU) += edu.o common-obj-$(CONFIG_PCA9552) += pca9552.o -common-obj-y += unimp.o +common-obj-$(CONFIG_UNIMP) += unimp.o common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o # ARM devices diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index d4d76a89be..f9f8b0f73a 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -17,3 +17,4 @@ config NIAGARA bool select EMPTY_SLOT select SUN4V_RTC + select UNIMP From patchwork Sat Aug 17 10:19:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1148698 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 469btD21WHz9s00 for ; Sat, 17 Aug 2019 20:25:24 +1000 (AEST) Received: from localhost ([::1]:35438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvth-0007om-H3 for incoming@patchwork.ozlabs.org; Sat, 17 Aug 2019 06:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58250) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyvoe-00018s-I1 for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:20:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyvod-0004ln-GT for qemu-devel@nongnu.org; Sat, 17 Aug 2019 06:20:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58904) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyvob-0004iC-BW; Sat, 17 Aug 2019 06:20:05 -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 9064C102504A; Sat, 17 Aug 2019 10:20:04 +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 4A17A18ABE; Sat, 17 Aug 2019 10:20:02 +0000 (UTC) From: Thomas Huth To: Paolo Bonzini , Yang Zhong , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Date: Sat, 17 Aug 2019 12:19:31 +0200 Message-Id: <20190817101931.28386-9-thuth@redhat.com> In-Reply-To: <20190817101931.28386-1-thuth@redhat.com> References: <20190817101931.28386-1-thuth@redhat.com> MIME-Version: 1.0 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.66]); Sat, 17 Aug 2019 10:20:04 +0000 (UTC) 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 8/8] hw/core: Add a config switch for the generic loader 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The generic loader device is completely optional. Let's add a proper config switch for it so that people can disable it if they don't need it and want to create a minimalistic QEMU binary. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- hw/core/Kconfig | 4 ++++ hw/core/Makefile.objs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/Kconfig b/hw/core/Kconfig index fffb3d62b2..fdf03514d7 100644 --- a/hw/core/Kconfig +++ b/hw/core/Kconfig @@ -7,6 +7,10 @@ config PTIMER config FITLOADER bool +config GENERIC_LOADER + bool + default y + config OR_IRQ bool diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index bb1afe422a..b49f880a0c 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -21,7 +21,7 @@ common-obj-$(CONFIG_REGISTER) += register.o common-obj-$(CONFIG_OR_IRQ) += or-irq.o common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o -common-obj-$(CONFIG_SOFTMMU) += generic-loader.o +common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o common-obj-$(CONFIG_SOFTMMU) += null-machine.o obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o