From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:55837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN0y-00082W-AP for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN0w-00057K-BV for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:20 -0400 From: Thomas Huth Date: Tue, 30 Apr 2019 09:13:50 +0200 Message-Id: <20190430071405.16714-16-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 15/30] hw/arm: Express dependencies of collie with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Cc: Beniamino Galvani , Rob Herring , Aurelien Jarno , Cedric Le Goater , Jan Kiszka , qemu-arm@nongnu.org, Andrzej Zaborowski , John Snow , Igor Mitsyanko , Joel Stanley , Peter Chubb , "Edgar E . Iglesias" , Antony Pavlov , qemu-block@nongnu.org, Jean-Christophe Dubois , Marcel Apfelbaum , Philippe Mathieu-Daude , Alistair Francis , "Michael S. Tsirkin" , Subbaraya Sundeep , Andrew Jeffery , Andrey Smirnov , Gerd Hoffmann Add Kconfig dependencies for the Strongarm collie machine. This patch is based on earlier work by =C3=81kos Kov=C3=A1cs (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index af78e7c892..25e8f717ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -97,5 +98,3 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy - -CONFIG_STRONGARM=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index dfdc1b1fd6..a507144d9a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -169,6 +169,13 @@ config STELLARIS =20 config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM =20 config SX1 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 00328d1b0b..729e711b87 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) +=3D tosa.o obj-$(CONFIG_Z2) +=3D z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o -obj-$(CONFIG_STRONGARM) +=3D collie.o +obj-$(CONFIG_COLLIE) +=3D collie.o obj-$(CONFIG_VERSATILE) +=3D versatilepb.o obj-$(CONFIG_VEXPRESS) +=3D vexpress.o obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o --=20 2.21.0 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.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 A9114C43219 for ; Tue, 30 Apr 2019 07:30:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 794E02080C for ; Tue, 30 Apr 2019 07:30:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 794E02080C 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 ([127.0.0.1]:40580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNDp-0002QE-Gj for qemu-devel@archiver.kernel.org; Tue, 30 Apr 2019 03:30:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN0y-00082W-AP for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN0w-00057K-BV for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN0h-00052D-Qf; Tue, 30 Apr 2019 03:17:03 -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 DE83830832CC; Tue, 30 Apr 2019 07:17:01 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0F061001E85; Tue, 30 Apr 2019 07:16:52 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:50 +0200 Message-Id: <20190430071405.16714-16-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-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.44]); Tue, 30 Apr 2019 07:17:02 +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 v6 15/30] hw/arm: Express dependencies of collie with Kconfig 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190430071350.yrJrJi4I577vNHK9hJZk_nRR3juQcVUlMdP7IpVU5Jg@z> Add Kconfig dependencies for the Strongarm collie machine. This patch is based on earlier work by =C3=81kos Kov=C3=A1cs (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index af78e7c892..25e8f717ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -97,5 +98,3 @@ CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy - -CONFIG_STRONGARM=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index dfdc1b1fd6..a507144d9a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -169,6 +169,13 @@ config STELLARIS =20 config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM =20 config SX1 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 00328d1b0b..729e711b87 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) +=3D tosa.o obj-$(CONFIG_Z2) +=3D z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o -obj-$(CONFIG_STRONGARM) +=3D collie.o +obj-$(CONFIG_COLLIE) +=3D collie.o obj-$(CONFIG_VERSATILE) +=3D versatilepb.o obj-$(CONFIG_VEXPRESS) +=3D vexpress.o obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o --=20 2.21.0