From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:45667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMQ-0002xR-0m for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMN-0001im-RW for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:09 -0400 From: Thomas Huth Date: Thu, 18 Apr 2019 20:00:32 +0200 Message-Id: <20190418180057.3593-5-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines 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 , Jan Kiszka , Antony Pavlov , Peter Chubb , qemu-block@nongnu.org, Cedric Le Goater , "Michael S. Tsirkin" , Andrew Jeffery , Igor Mitsyanko , Andrey Smirnov , Rob Herring , qemu-arm@nongnu.org, Andrzej Zaborowski , John Snow , Joel Stanley , "Edgar E . Iglesias" , Jean-Christophe Dubois , Marcel Apfelbaum , Philippe Mathieu-Daude , Alistair Francis , Subbaraya Sundeep , Gerd Hoffmann Add Kconfig dependencies for the Exynos-related boards (nuri and smdkc210). This patch is slightly based on earlier work by =C3=81kos Kov=C3=A1cs (i.= e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 613d19a06d..2a11e76cc7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,14 @@ # Default configuration for arm-softmmu =20 +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=3Dy + CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_PCI_TESTDEV=3Dy + +CONFIG_EXYNOS4=3Dy + CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -26,7 +32,6 @@ CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_LAN9118=3Dy CONFIG_SMC91C111=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy @@ -36,21 +41,15 @@ CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy CONFIG_USB_MUSB=3Dy -CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_ARM11MPCORE=3Dy -CONFIG_A9MPCORE=3Dy CONFIG_A15MPCORE=3Dy =20 -CONFIG_ARM_V7M=3Dy CONFIG_NETDUINO2=3Dy =20 -CONFIG_ARM_GIC=3Dy CONFIG_ARM_TIMER=3Dy -CONFIG_ARM_MPTIMER=3Dy -CONFIG_A9_GTIMER=3Dy CONFIG_PL011=3Dy CONFIG_PL022=3Dy CONFIG_PL031=3Dy @@ -61,11 +60,9 @@ CONFIG_PL080=3Dy CONFIG_PL110=3Dy CONFIG_PL181=3Dy CONFIG_PL190=3Dy -CONFIG_PL310=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_XGMAC=3Dy -CONFIG_EXYNOS4=3Dy CONFIG_PXA2XX=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy @@ -73,7 +70,6 @@ CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_ARM11SCU=3Dy -CONFIG_A9SCU=3Dy CONFIG_DIGIC=3Dy CONFIG_MARVELL_88W8618=3Dy CONFIG_OMAP=3Dy @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=3Dy CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 -CONFIG_SDHCI=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_INTEGRATOR_DEBUG=3Dy =20 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d298fbdc89..acd07b2add 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -8,7 +8,13 @@ config DIGIC =20 config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS =20 config HIGHBANK bool @@ -104,6 +110,10 @@ config ZAURUS =20 config A9MPCORE bool + select A9_GTIMER + select A9SCU # snoop control unit + select ARM_GIC + select ARM_MPTIMER =20 config A15MPCORE bool --=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 98D63C10F0E for ; Thu, 18 Apr 2019 18:10:44 +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 69D2F218AE for ; Thu, 18 Apr 2019 18:10:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69D2F218AE 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]:45182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBUh-00015h-ID for qemu-devel@archiver.kernel.org; Thu, 18 Apr 2019 14:10:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMQ-0002xR-0m for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMN-0001im-RW for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMA-0001T2-5l; Thu, 18 Apr 2019 14:01:54 -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 DE4C3307CB2F; Thu, 18 Apr 2019 18:01:41 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4352D1001DEF; Thu, 18 Apr 2019 18:01:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:32 +0200 Message-Id: <20190418180057.3593-5-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.42]); Thu, 18 Apr 2019 18:01:42 +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 for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines 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" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190418180032.H5q7Q-qsmJYI-tB4wp9knEyqAyEtatnaJAoAERQsuH8@z> Add Kconfig dependencies for the Exynos-related boards (nuri and smdkc210). This patch is slightly based on earlier work by =C3=81kos Kov=C3=A1cs (i.= e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 613d19a06d..2a11e76cc7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,14 @@ # Default configuration for arm-softmmu =20 +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=3Dy + CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_PCI_TESTDEV=3Dy + +CONFIG_EXYNOS4=3Dy + CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -26,7 +32,6 @@ CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_LAN9118=3Dy CONFIG_SMC91C111=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy @@ -36,21 +41,15 @@ CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy CONFIG_USB_MUSB=3Dy -CONFIG_USB_EHCI_SYSBUS=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_ARM11MPCORE=3Dy -CONFIG_A9MPCORE=3Dy CONFIG_A15MPCORE=3Dy =20 -CONFIG_ARM_V7M=3Dy CONFIG_NETDUINO2=3Dy =20 -CONFIG_ARM_GIC=3Dy CONFIG_ARM_TIMER=3Dy -CONFIG_ARM_MPTIMER=3Dy -CONFIG_A9_GTIMER=3Dy CONFIG_PL011=3Dy CONFIG_PL022=3Dy CONFIG_PL031=3Dy @@ -61,11 +60,9 @@ CONFIG_PL080=3Dy CONFIG_PL110=3Dy CONFIG_PL181=3Dy CONFIG_PL190=3Dy -CONFIG_PL310=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_XGMAC=3Dy -CONFIG_EXYNOS4=3Dy CONFIG_PXA2XX=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy @@ -73,7 +70,6 @@ CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_ARM11SCU=3Dy -CONFIG_A9SCU=3Dy CONFIG_DIGIC=3Dy CONFIG_MARVELL_88W8618=3Dy CONFIG_OMAP=3Dy @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=3Dy CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 -CONFIG_SDHCI=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_INTEGRATOR_DEBUG=3Dy =20 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d298fbdc89..acd07b2add 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -8,7 +8,13 @@ config DIGIC =20 config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS =20 config HIGHBANK bool @@ -104,6 +110,10 @@ config ZAURUS =20 config A9MPCORE bool + select A9_GTIMER + select A9SCU # snoop control unit + select ARM_GIC + select ARM_MPTIMER =20 config A15MPCORE bool --=20 2.21.0