From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049594506165.14724174630896; Wed, 13 Feb 2019 01:19:54 -0800 (PST) Received: from localhost ([127.0.0.1]:53593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqhn-0000Pe-E9 for importer@patchew.org; Wed, 13 Feb 2019 04:19:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG6-0002Kh-On for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq3s-0004xc-68 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:38:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37644) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq3p-0004vF-PZ; Wed, 13 Feb 2019 03:38:29 -0500 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 05CFAC06A81A; Wed, 13 Feb 2019 08:38:29 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7DE510021B6; Wed, 13 Feb 2019 08:38:26 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:37:54 +0100 Message-Id: <1550047098-1210-2-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.32]); Wed, 13 Feb 2019 08:38:29 +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 v2 01/25] 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 | 16 ++++++---------- hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 8283aeb..3baafc4 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,12 @@ # Default configuration for arm-softmmu =20 -CONFIG_PCI=3Dy +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=3Dy + CONFIG_PCI_DEVICES=3Dy + +CONFIG_EXYNOS4=3Dy + CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -25,7 +30,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 @@ -35,7 +39,6 @@ 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 @@ -43,13 +46,9 @@ 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 @@ -60,11 +59,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 @@ -72,7 +69,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 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3176680..2850000 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -7,7 +7,14 @@ config DIGIC =20 config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PCI + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS =20 config HIGHBANK bool @@ -109,6 +116,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 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049360818806.0840888922163; Wed, 13 Feb 2019 01:16:00 -0800 (PST) Received: from localhost ([127.0.0.1]:53550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqe5-0005v9-Qf for importer@patchew.org; Wed, 13 Feb 2019 04:15:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG6-0002Tc-H1 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq3v-00050B-A8 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:38:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55398) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq3s-0004xg-RO; Wed, 13 Feb 2019 03:38:34 -0500 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 114FFC01DDFD; Wed, 13 Feb 2019 08:38:32 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A027A101E841; Wed, 13 Feb 2019 08:38:29 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:37:55 +0100 Message-Id: <1550047098-1210-3-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.31]); Wed, 13 Feb 2019 08:38:32 +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 v2 02/25] hw/arm: Express dependencies of the highbank 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the highbank machine (and the midway machine). 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 | 4 +--- hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3baafc4..59734ee 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=3Dy CONFIG_PCI_DEVICES=3Dy =20 CONFIG_EXYNOS4=3Dy +CONFIG_HIGHBANK=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -54,14 +55,12 @@ CONFIG_PL022=3Dy CONFIG_PL031=3Dy CONFIG_PL041=3Dy CONFIG_PL050=3Dy -CONFIG_PL061=3Dy CONFIG_PL080=3Dy CONFIG_PL110=3Dy CONFIG_PL181=3Dy CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy -CONFIG_XGMAC=3Dy CONFIG_PXA2XX=3Dy CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy @@ -151,7 +150,6 @@ CONFIG_XILINX_AXI=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy -CONFIG_HIGHBANK=3Dy CONFIG_MUSICPAL=3Dy =20 # for realview and versatilepb diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2850000..984de8a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -18,6 +18,18 @@ config EXYNOS4 =20 config HIGHBANK bool + select A9MPCORE + select A15MPCORE + select AHCI + select ARM_TIMER # sp804 + select ARM_V7M + select PCI + select PL011 # UART + select PL022 # Serial port + select PL031 # RTC + select PL061 # GPIO + select PL310 # cache controller + select XGMAC # ethernet =20 config INTEGRATOR bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048501277112.67595142434322; Wed, 13 Feb 2019 01:01:41 -0800 (PST) Received: from localhost ([127.0.0.1]:53316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqQE-0002jc-3F for importer@patchew.org; Wed, 13 Feb 2019 04:01:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG6-00025D-BB for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq40-00057A-Hu for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:38:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44902) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq3v-00050F-Uq; Wed, 13 Feb 2019 03:38:36 -0500 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 2462C2D80F; Wed, 13 Feb 2019 08:38:35 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98E0010021B6; Wed, 13 Feb 2019 08:38:32 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:37:56 +0100 Message-Id: <1550047098-1210-4-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.30]); Wed, 13 Feb 2019 08:38:35 +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 v2 03/25] hw/arm: Express dependencies of integratorcp 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 | 11 +---------- hw/arm/Kconfig | 9 +++++++++ hw/display/Kconfig | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 59734ee..2033050 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -7,6 +7,7 @@ CONFIG_PCI_DEVICES=3Dy =20 CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy +CONFIG_INTEGRATOR=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -31,7 +32,6 @@ CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_SMC91C111=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy CONFIG_FTGMAC100=3Dy @@ -49,15 +49,8 @@ CONFIG_A15MPCORE=3Dy =20 CONFIG_NETDUINO2=3Dy =20 -CONFIG_ARM_TIMER=3Dy -CONFIG_PL011=3Dy -CONFIG_PL022=3Dy -CONFIG_PL031=3Dy CONFIG_PL041=3Dy -CONFIG_PL050=3Dy CONFIG_PL080=3Dy -CONFIG_PL110=3Dy -CONFIG_PL181=3Dy CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy @@ -119,8 +112,6 @@ CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 CONFIG_SDHCI=3Dy -CONFIG_INTEGRATOR=3Dy -CONFIG_INTEGRATOR_DEBUG=3Dy =20 CONFIG_ALLWINNER_A10_PIT=3Dy CONFIG_ALLWINNER_A10_PIC=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 984de8a..c022b8d 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -33,6 +33,15 @@ config HIGHBANK =20 config INTEGRATOR bool + select ARM_TIMER + select INTEGRATOR_DEBUG + select PL011 # UART + select PL031 # RTC + select PL050 # keyboard/mouse + select PL110 # pl111 LCD controller + select PL181 # display + select PCI + select SMC91C111 =20 config MAINSTONE bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index ee3acd9..34c8c12 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -21,6 +21,7 @@ config JAZZ_LED =20 config PL110 bool + select FRAMEBUFFER =20 config SII9022 bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049488679554.2777816324323; Wed, 13 Feb 2019 01:18:08 -0800 (PST) Received: from localhost ([127.0.0.1]:53573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqg6-0007Re-IB for importer@patchew.org; Wed, 13 Feb 2019 04:18:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG5-00024X-Rx for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4G-0005Su-T0 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:38:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53008) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq44-00057E-Ey; Wed, 13 Feb 2019 03:38:46 -0500 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 5BAC73DE11; Wed, 13 Feb 2019 08:38:40 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id E249D10021B6; Wed, 13 Feb 2019 08:38:36 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:37:57 +0100 Message-Id: <1550047098-1210-5-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.29]); Wed, 13 Feb 2019 08:38:40 +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 v2 04/25] hw/arm: Express dependencies of the fsl-imx31 machine 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the fsl-imx31 / kzm machine. 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 | 3 +-- hw/arm/Kconfig | 5 +++++ hw/misc/Kconfig | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 2033050..19d0ab0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy +CONFIG_FSL_IMX31=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -68,7 +69,6 @@ CONFIG_TSC210X=3Dy CONFIG_BLIZZARD=3Dy CONFIG_ONENAND=3Dy CONFIG_TUSB6010=3Dy -CONFIG_IMX=3Dy CONFIG_MAINSTONE=3Dy CONFIG_MPS2=3Dy CONFIG_NSERIES=3Dy @@ -118,7 +118,6 @@ CONFIG_ALLWINNER_A10_PIC=3Dy CONFIG_ALLWINNER_A10=3Dy =20 CONFIG_FSL_IMX6=3Dy -CONFIG_FSL_IMX31=3Dy CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c022b8d..3d0ee29 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -103,6 +103,11 @@ config FSL_IMX25 =20 config FSL_IMX31 bool + select SERIAL + select IMX + select IMX_I2C + select LAN9118 + select PCI =20 config FSL_IMX6 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 11d4b30..54ff9a8 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -76,6 +76,8 @@ config ECCMEMCTL config IMX bool select PTIMER + select SSI + select USB_EHCI_SYSBUS =20 config STM32F2XX_SYSCFG bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049301074753.487556482344; Wed, 13 Feb 2019 01:15:01 -0800 (PST) Received: from localhost ([127.0.0.1]:53513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqd8-000509-82 for importer@patchew.org; Wed, 13 Feb 2019 04:14:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG5-00025D-C9 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4I-0005VU-MA for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:38:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58158) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4A-0005Gz-7o; Wed, 13 Feb 2019 03:38:52 -0500 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 4D1E180481; Wed, 13 Feb 2019 08:38:47 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id B53C0101E841; Wed, 13 Feb 2019 08:38:40 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:37:58 +0100 Message-Id: <1550047098-1210-6-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.28]); Wed, 13 Feb 2019 08:38:47 +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 v2 05/25] hw/arm: Express dependencies of musicpal 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 | 6 +----- hw/arm/Kconfig | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 19d0ab0..fe7e306 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -9,13 +9,13 @@ CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_FSL_IMX31=3Dy +CONFIG_MUSICPAL=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy CONFIG_MAX7310=3Dy -CONFIG_WM8750=3Dy CONFIG_TWL92230=3Dy CONFIG_TSC2005=3Dy CONFIG_LM832X=3Dy @@ -38,7 +38,6 @@ CONFIG_IMX_FEC=3Dy CONFIG_FTGMAC100=3Dy CONFIG_DS1338=3Dy CONFIG_PFLASH_CFI01=3Dy -CONFIG_PFLASH_CFI02=3Dy CONFIG_MICRODRIVE=3Dy CONFIG_USB_MUSB=3Dy CONFIG_PLATFORM_BUS=3Dy @@ -56,14 +55,12 @@ CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_PXA2XX=3Dy -CONFIG_BITBANG_I2C=3Dy CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_ARM11SCU=3Dy CONFIG_DIGIC=3Dy -CONFIG_MARVELL_88W8618=3Dy CONFIG_OMAP=3Dy CONFIG_TSC210X=3Dy CONFIG_BLIZZARD=3Dy @@ -140,7 +137,6 @@ CONFIG_XILINX_AXI=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy -CONFIG_MUSICPAL=3Dy =20 # for realview and versatilepb CONFIG_LSI_SCSI_PCI=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3d0ee29..aeb0cf0 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -48,7 +48,13 @@ config MAINSTONE =20 config MUSICPAL bool + select BITBANG_I2C + select MARVELL_88W8618 select PTIMER + select PFLASH_CFI02 + select PCI + select SERIAL + select WM8750 =20 config NETDUINO2 bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049368477371.1856055722923; Wed, 13 Feb 2019 01:16:08 -0800 (PST) Received: from localhost ([127.0.0.1]:53555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqeD-0005yy-EK for importer@patchew.org; Wed, 13 Feb 2019 04:16:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG5-000256-8B for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4I-0005Vc-OI for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:38:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4F-0005K5-3y; Wed, 13 Feb 2019 03:38:56 -0500 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 2DF495D61D; Wed, 13 Feb 2019 08:38:50 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id D86B8101E841; Wed, 13 Feb 2019 08:38:47 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:37:59 +0100 Message-Id: <1550047098-1210-7-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.39]); Wed, 13 Feb 2019 08:38:50 +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 v2 06/25] hw/arm: Express dependencies of the OMAP 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the OMAP machines (cheetah, n800, n810, sx1 and sx1-v1). 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 | 15 +++------------ hw/arm/Kconfig | 26 ++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index fe7e306..492db53 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -10,16 +10,15 @@ CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_FSL_IMX31=3Dy CONFIG_MUSICPAL=3Dy +CONFIG_CHEETAH=3Dy +CONFIG_SX1=3Dy +CONFIG_NSERIES=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy CONFIG_SERIAL=3Dy CONFIG_MAX7310=3Dy -CONFIG_TWL92230=3Dy -CONFIG_TSC2005=3Dy -CONFIG_LM832X=3Dy -CONFIG_TMP105=3Dy CONFIG_TMP421=3Dy CONFIG_PCA9552=3Dy CONFIG_STELLARIS=3Dy @@ -37,9 +36,7 @@ CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy CONFIG_FTGMAC100=3Dy CONFIG_DS1338=3Dy -CONFIG_PFLASH_CFI01=3Dy CONFIG_MICRODRIVE=3Dy -CONFIG_USB_MUSB=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 @@ -61,14 +58,8 @@ CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_ARM11SCU=3Dy CONFIG_DIGIC=3Dy -CONFIG_OMAP=3Dy -CONFIG_TSC210X=3Dy -CONFIG_BLIZZARD=3Dy -CONFIG_ONENAND=3Dy -CONFIG_TUSB6010=3Dy CONFIG_MAINSTONE=3Dy CONFIG_MPS2=3Dy -CONFIG_NSERIES=3Dy CONFIG_RASPI=3Dy CONFIG_REALVIEW=3Dy CONFIG_ZAURUS=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index aeb0cf0..fe1505e 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,6 +1,11 @@ config ARM_VIRT bool =20 +config CHEETAH + bool + select OMAP + select TSC210X + config DIGIC bool select PTIMER @@ -61,9 +66,26 @@ config NETDUINO2 =20 config NSERIES bool + select OMAP + select TMP105 # tempature sensor + select BLIZZARD # LCD/TV controller + select ONENAND + select TSC210X # touchscreen/sensors/audio + select TSC2005 # touchscreen/sensors/keypad + select LM832X # GPIO keyboard chip + select TWL92230 # energy-management + select TUSB6010 =20 config OMAP bool + select FRAMEBUFFER + select I2C + select ECC + select NAND + select PFLASH_CFI01 + select PCI + select SD + select SERIAL =20 config PXA2XX bool @@ -77,6 +99,10 @@ config STELLARIS config STRONGARM bool =20 +config SX1 + bool + select OMAP + config VERSATILE bool =20 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fa40e8d..b0fd556 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -9,7 +9,8 @@ obj-$(CONFIG_MAINSTONE) +=3D mainstone.o obj-$(CONFIG_MUSICPAL) +=3D musicpal.o obj-$(CONFIG_NETDUINO2) +=3D netduino2.o obj-$(CONFIG_NSERIES) +=3D nseries.o -obj-$(CONFIG_OMAP) +=3D omap_sx1.o palm.o +obj-$(CONFIG_SX1) +=3D omap_sx1.o +obj-$(CONFIG_CHEETAH) +=3D palm.o obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.o tosa.o z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049179754394.6008355772176; Wed, 13 Feb 2019 01:12:59 -0800 (PST) Received: from localhost ([127.0.0.1]:53488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqbA-0003G4-D8 for importer@patchew.org; Wed, 13 Feb 2019 04:12:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG4-00024X-UB for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4J-0005X2-Cg for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58204) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4G-0005Ne-SI; Wed, 13 Feb 2019 03:38:57 -0500 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 27CB180467; Wed, 13 Feb 2019 08:38:53 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7F05101E841; Wed, 13 Feb 2019 08:38:50 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:00 +0100 Message-Id: <1550047098-1210-8-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.28]); Wed, 13 Feb 2019 08:38: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 v2 07/25] hw/arm: Express dependencies of stellaris 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 492db53..1be49bd 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -13,6 +13,7 @@ CONFIG_MUSICPAL=3Dy CONFIG_CHEETAH=3Dy CONFIG_SX1=3Dy CONFIG_NSERIES=3Dy +CONFIG_STELLARIS=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -21,16 +22,10 @@ CONFIG_SERIAL=3Dy CONFIG_MAX7310=3Dy CONFIG_TMP421=3Dy CONFIG_PCA9552=3Dy -CONFIG_STELLARIS=3Dy -CONFIG_STELLARIS_INPUT=3Dy -CONFIG_STELLARIS_ENET=3Dy -CONFIG_SSD0303=3Dy -CONFIG_SSD0323=3Dy CONFIG_DDC=3Dy CONFIG_SII9022=3Dy CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy -CONFIG_SSI_SD=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index fe1505e..3034252 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -95,6 +95,16 @@ config REALVIEW =20 config STELLARIS bool + select ARM_V7M + select I2C + select PL011 # UART + select PL022 # Serial port + select PL061 # GPIO + select SSD0303 # OLED display + select SSD0323 # OLED display + select SSI_SD + select STELLARIS_INPUT + select STELLARIS_ENET # ethernet =20 config STRONGARM bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048283607434.7623188524519; Wed, 13 Feb 2019 00:58:03 -0800 (PST) Received: from localhost ([127.0.0.1]:53247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqMf-0007qU-IO for importer@patchew.org; Wed, 13 Feb 2019 03:57:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG4-0002Kh-NM for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4J-0005Xr-RG for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4G-0005Rp-UZ; Wed, 13 Feb 2019 03:38:57 -0500 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 26ADAC04BD34; Wed, 13 Feb 2019 08:38:56 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB584101E841; Wed, 13 Feb 2019 08:38:53 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:01 +0100 Message-Id: <1550047098-1210-9-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.31]); Wed, 13 Feb 2019 08:38:56 +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 v2 08/25] hw/arm: Express dependencies of realview, versatile and vexpress 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 | 23 +++----------------- hw/arm/Kconfig | 47 +++++++++++++++++++++++++++++++++++++= ++++ hw/arm/Makefile.objs | 3 ++- hw/display/Kconfig | 1 + hw/i2c/Kconfig | 2 +- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 1be49bd..2bac13b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,8 +3,6 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=3Dy =20 -CONFIG_PCI_DEVICES=3Dy - CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -14,6 +12,9 @@ CONFIG_CHEETAH=3Dy CONFIG_SX1=3Dy CONFIG_NSERIES=3Dy CONFIG_STELLARIS=3Dy +CONFIG_REALVIEW=3Dy +CONFIG_VERSATILE=3Dy +CONFIG_VEXPRESS=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -22,8 +23,6 @@ CONFIG_SERIAL=3Dy CONFIG_MAX7310=3Dy CONFIG_TMP421=3Dy CONFIG_PCA9552=3Dy -CONFIG_DDC=3Dy -CONFIG_SII9022=3Dy CONFIG_ADS7846=3Dy CONFIG_MAX111X=3Dy CONFIG_SSI_M25P80=3Dy @@ -35,15 +34,8 @@ CONFIG_MICRODRIVE=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 -CONFIG_ARM11MPCORE=3Dy -CONFIG_A9MPCORE=3Dy -CONFIG_A15MPCORE=3Dy - CONFIG_NETDUINO2=3Dy =20 -CONFIG_PL041=3Dy -CONFIG_PL080=3Dy -CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_PXA2XX=3Dy @@ -51,12 +43,10 @@ CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 -CONFIG_ARM11SCU=3Dy CONFIG_DIGIC=3Dy CONFIG_MAINSTONE=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_REALVIEW=3Dy CONFIG_ZAURUS=3Dy CONFIG_ZYNQ=3Dy CONFIG_STM32F2XX_TIMER=3Dy @@ -84,10 +74,6 @@ CONFIG_IOTKIT_SYSCTL=3Dy CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy =20 -CONFIG_VERSATILE=3Dy -CONFIG_VERSATILE_PCI=3Dy -CONFIG_VERSATILE_I2C=3Dy - CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy CONFIG_VFIO_PLATFORM=3Dy @@ -123,6 +109,3 @@ CONFIG_XILINX_AXI=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy - -# for realview and versatilepb -CONFIG_LSI_SCSI_PCI=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3034252..b76fd7c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -92,6 +92,29 @@ config PXA2XX =20 config REALVIEW bool + imply PCI_DEVICES + select SMC91C111 + select LAN9118 + select A9MPCORE + select A15MPCORE + select ARM11MPCORE + select ARM_TIMER + select VERSATILE_PCI + select WM8750 # audio codec + select LSI_SCSI_PCI + select PCI + select PL011 # UART + select PL031 # RTC + select PL041 # audio codec + select PL050 # keyboard/mouse + select PL061 # GPIO + select PL080 # DMA controller + select PL110 + select PL181 # display + select PL310 # cache controller + select VERSATILE_I2C + select DS1338 # I2C RTC+NVRAM + select USB_OHCI =20 config STELLARIS bool @@ -115,6 +138,29 @@ config SX1 =20 config VERSATILE bool + select ARM_TIMER # sp804 + select PFLASH_CFI01 + select LSI_SCSI_PCI + select PL050 # keyboard/mouse + select PL080 # DMA controller + select PL190 # Vector PIC + select REALVIEW + select USB_OHCI + +config VEXPRESS + bool + select A9MPCORE + select A15MPCORE + select ARM_MPTIMER + select ARM_TIMER # sp804 + select LAN9118 + select PFLASH_CFI01 + select PL011 # UART + select PL041 # audio codec + select PL181 # display + select REALVIEW + select SII9022 + select VIRTIO_MMIO =20 config ZYNQ bool @@ -194,6 +240,7 @@ config A15MPCORE =20 config ARM11MPCORE bool + select ARM11SCU =20 config ARMSSE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index b0fd556..420641e 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -15,7 +15,8 @@ obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.o tosa.o z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o obj-$(CONFIG_STRONGARM) +=3D collie.o -obj-$(CONFIG_VERSATILE) +=3D vexpress.o versatilepb.o +obj-$(CONFIG_VERSATILE) +=3D versatilepb.o +obj-$(CONFIG_VEXPRESS) +=3D vexpress.o obj-$(CONFIG_ZYNQ) +=3D xilinx_zynq.o =20 obj-$(CONFIG_ARM_V7M) +=3D armv7m.o diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 34c8c12..a5f3fc0 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -26,6 +26,7 @@ config PL110 config SII9022 bool depends on I2C + select DDC =20 config SSD0303 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index ef1caa6..0004893 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -12,7 +12,7 @@ config DDC =20 config VERSATILE_I2C bool - select I2C + select BITBANG_I2C =20 config ACPI_SMBUS bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049003858461.54083536074813; Wed, 13 Feb 2019 01:10:03 -0800 (PST) Received: from localhost ([127.0.0.1]:53421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqYK-0000mJ-Py for importer@patchew.org; Wed, 13 Feb 2019 04:10:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG4-00025E-9R for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4M-0005a3-HC for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45148) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4L-0005YM-9q; Wed, 13 Feb 2019 03:39:01 -0500 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 804E12D80F; Wed, 13 Feb 2019 08:39:00 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8959101E841; Wed, 13 Feb 2019 08:38:56 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:02 +0100 Message-Id: <1550047098-1210-10-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.30]); Wed, 13 Feb 2019 08:39:00 +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 v2 09/25] hw/arm: Express dependencies of the PXA2xx 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the PXA2xx machines (akita, borzoi, connex and verdex gumstix, tosa, mainstone, spitz, terrier and z2). This patch is 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 | 46 +++++++++++++++++++++++++++++++++++++= ++++ hw/arm/Makefile.objs | 5 ++++- 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 2bac13b..1db76f6 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -15,22 +15,20 @@ CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy CONFIG_VERSATILE=3Dy CONFIG_VEXPRESS=3Dy +CONFIG_MAINSTONE=3Dy +CONFIG_GUMSTIX=3Dy +CONFIG_SPITZ=3Dy +CONFIG_TOSA=3Dy +CONFIG_Z2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_NAND=3Dy -CONFIG_ECC=3Dy -CONFIG_SERIAL=3Dy -CONFIG_MAX7310=3Dy CONFIG_TMP421=3Dy CONFIG_PCA9552=3Dy -CONFIG_ADS7846=3Dy -CONFIG_MAX111X=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy CONFIG_FTGMAC100=3Dy CONFIG_DS1338=3Dy -CONFIG_MICRODRIVE=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 @@ -38,16 +36,13 @@ CONFIG_NETDUINO2=3Dy =20 CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy -CONFIG_PXA2XX=3Dy CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_DIGIC=3Dy -CONFIG_MAINSTONE=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_ZAURUS=3Dy CONFIG_ZYNQ=3Dy CONFIG_STM32F2XX_TIMER=3Dy CONFIG_STM32F2XX_USART=3Dy @@ -80,8 +75,6 @@ CONFIG_VFIO_PLATFORM=3Dy CONFIG_VFIO_XGMAC=3Dy CONFIG_VFIO_AMD_XGBE=3Dy =20 -CONFIG_SDHCI=3Dy - CONFIG_ALLWINNER_A10_PIT=3Dy CONFIG_ALLWINNER_A10_PIC=3Dy CONFIG_ALLWINNER_A10=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b76fd7c..95f2713 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -89,6 +89,50 @@ config OMAP =20 config PXA2XX bool + select FRAMEBUFFER + select I2C + select PCI + select SERIAL + select SD + select SSI + select USB_OHCI + +config GUMSTIX + bool + select PFLASH_CFI01 + select SMC91C111 + select PXA2XX + +config TOSA + bool + select ZAURUS # scoop + select MICRODRIVE + select PXA2XX + +config MAINSTONE + bool + select PXA2XX + select PFLASH_CFI01 + select SMC91C111 + +config SPITZ + bool + select ADS7846 # display + select MAX111X # A/D converter + select WM8750 # audio codec + select MAX7310 # GPIO expander + select ZAURUS # scoop + select NAND # memory + select ECC # Error-correcting for NAND + select MICRODRIVE + select PXA2XX + +config Z2 + bool + select PFLASH_CFI01 + select WM8750 + select PL011 # UART + select PXA2XX =20 config REALVIEW bool @@ -227,6 +271,8 @@ config MSF2 =20 config ZAURUS bool + select NAND + select ECC =20 config A9MPCORE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 420641e..93e1160 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -11,7 +11,10 @@ obj-$(CONFIG_NETDUINO2) +=3D netduino2.o obj-$(CONFIG_NSERIES) +=3D nseries.o obj-$(CONFIG_SX1) +=3D omap_sx1.o obj-$(CONFIG_CHEETAH) +=3D palm.o -obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.o tosa.o z2.o +obj-$(CONFIG_GUMSTIX) +=3D gumstix.o +obj-$(CONFIG_SPITZ) +=3D spitz.o +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 --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048800238241.28576735271054; Wed, 13 Feb 2019 01:06:40 -0800 (PST) Received: from localhost ([127.0.0.1]:53390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqV0-0006fq-6h for importer@patchew.org; Wed, 13 Feb 2019 04:06:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG3-00024X-SQ for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4d-0005iQ-AY for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47926) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4S-0005cl-7W; Wed, 13 Feb 2019 03:39:08 -0500 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 4BCBE89AD9; Wed, 13 Feb 2019 08:39:07 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 170D3101E841; Wed, 13 Feb 2019 08:39:00 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:03 +0100 Message-Id: <1550047098-1210-11-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.26]); Wed, 13 Feb 2019 08:39:07 +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 v2 10/25] hw/arm: Express dependencies of xilinx-zynq 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the xilinx-zynq-a9 board. This patch is 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 | 7 +------ hw/arm/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 1db76f6..5c43bb3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -15,6 +15,7 @@ CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy CONFIG_VERSATILE=3Dy CONFIG_VEXPRESS=3Dy +CONFIG_ZYNQ=3Dy CONFIG_MAINSTONE=3Dy CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy @@ -34,16 +35,11 @@ CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_NETDUINO2=3Dy =20 -CONFIG_PL330=3Dy -CONFIG_CADENCE=3Dy CONFIG_FRAMEBUFFER=3Dy -CONFIG_XILINX_SPIPS=3Dy -CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_DIGIC=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_ZYNQ=3Dy CONFIG_STM32F2XX_TIMER=3Dy CONFIG_STM32F2XX_USART=3Dy CONFIG_STM32F2XX_SYSCFG=3Dy @@ -98,7 +94,6 @@ CONFIG_SMBUS_EEPROM=3Dy CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy -CONFIG_XILINX_AXI=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy =20 CONFIG_STRONGARM=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 95f2713..67f1228 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -208,6 +208,20 @@ config VEXPRESS =20 config ZYNQ bool + select A9MPCORE + select CADENCE # UART + select PCI + select PFLASH_CFI02 + select PL330 + select SDHCI + select SSI_M25P80 + select USB_EHCI + select USB_EHCI_SYSBUS + select XILINX # UART + select XILINX_AXI + select XILINX_SPI + select XILINX_SPIPS + select ZYNQ_DEVCFG =20 config ARM_V7M bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049138533645.7859059500336; Wed, 13 Feb 2019 01:12:18 -0800 (PST) Received: from localhost ([127.0.0.1]:53474 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqaU-0002fY-8q for importer@patchew.org; Wed, 13 Feb 2019 04:12:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG3-00023s-GV for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4q-0005pv-Gb for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45254) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4V-0005eE-RH; Wed, 13 Feb 2019 03:39:13 -0500 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 2701E1B66; Wed, 13 Feb 2019 08:39:10 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0D27101E841; Wed, 13 Feb 2019 08:39:07 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:04 +0100 Message-Id: <1550047098-1210-12-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.30]); Wed, 13 Feb 2019 08:39:10 +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 v2 11/25] 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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). 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-softmmu.= mak index 5c43bb3..9851068 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -21,6 +21,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -95,5 +96,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 67f1228..39cbda9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -175,6 +175,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 93e1160..053fcb6 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 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048562602811.8274774821919; Wed, 13 Feb 2019 01:02:42 -0800 (PST) Received: from localhost ([127.0.0.1]:53323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqR5-0003M8-KZ for importer@patchew.org; Wed, 13 Feb 2019 04:02:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG3-00021O-6d for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4r-0005rB-8t for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57634) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4Z-0005fb-KM; Wed, 13 Feb 2019 03:39:19 -0500 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 361947F746; Wed, 13 Feb 2019 08:39:13 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFAF010021B6; Wed, 13 Feb 2019 08:39:10 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:05 +0100 Message-Id: <1550047098-1210-13-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.27]); Wed, 13 Feb 2019 08:39:13 +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 v2 12/25] hw/arm: Express dependencies of the aspeed boards 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Dependencies have been determined by looking at hw/arm/aspeed.c Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 9851068..b2e31b3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -22,15 +22,12 @@ CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy CONFIG_COLLIE=3Dy +CONFIG_ASPEED_SOC=3Dy =20 CONFIG_VGA=3Dy -CONFIG_TMP421=3Dy -CONFIG_PCA9552=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy -CONFIG_FTGMAC100=3Dy -CONFIG_DS1338=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 @@ -90,8 +87,6 @@ CONFIG_I82801B11=3Dy CONFIG_ACPI=3Dy CONFIG_ARM_VIRT=3Dy CONFIG_SMBIOS=3Dy -CONFIG_ASPEED_SOC=3Dy -CONFIG_SMBUS_EEPROM=3Dy CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy CONFIG_FW_CFG_DMA=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 39cbda9..a4fe2c8 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -267,6 +267,16 @@ config FSL_IMX6 =20 config ASPEED_SOC bool + select DS1338 + select FTGMAC100 + select I2C + select PCA9552 + select SERIAL + select SMBUS_EEPROM + select SSI + select SSI_M25P80 + select TMP105 + select TMP421 =20 config MPS2 bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048309954137.25189102598756; Wed, 13 Feb 2019 00:58:29 -0800 (PST) Received: from localhost ([127.0.0.1]:53249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqN8-0008Fn-Tv for importer@patchew.org; Wed, 13 Feb 2019 03:58:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG0-00021O-SO for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4w-0005yx-Hp for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57654) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4t-0005hA-8h; Wed, 13 Feb 2019 03:39:37 -0500 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 F3AEF81F19; Wed, 13 Feb 2019 08:39:15 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A843A101E841; Wed, 13 Feb 2019 08:39:13 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:06 +0100 Message-Id: <1550047098-1210-14-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.27]); Wed, 13 Feb 2019 08:39:16 +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 v2 13/25] hw/arm: Express dependencies of the virt machine 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Dependencies have been determined by looking at hw/arm/virt.c Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 14 +------------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b2e31b3..9db6808 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,6 +3,7 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=3Dy =20 +CONFIG_ARM_VIRT=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -28,8 +29,6 @@ CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy -CONFIG_PLATFORM_BUS=3Dy -CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_NETDUINO2=3Dy =20 @@ -63,12 +62,6 @@ CONFIG_IOTKIT_SYSCTL=3Dy CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy =20 -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy -CONFIG_VFIO_PLATFORM=3Dy -CONFIG_VFIO_XGMAC=3Dy -CONFIG_VFIO_AMD_XGBE=3Dy - CONFIG_ALLWINNER_A10_PIT=3Dy CONFIG_ALLWINNER_A10_PIC=3Dy CONFIG_ALLWINNER_A10=3Dy @@ -84,10 +77,5 @@ CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy -CONFIG_ACPI=3Dy -CONFIG_ARM_VIRT=3Dy -CONFIG_SMBIOS=3Dy -CONFIG_GPIO_KEY=3Dy CONFIG_MSF2=3Dy -CONFIG_FW_CFG_DMA=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index a4fe2c8..3d580fa 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,5 +1,23 @@ config ARM_VIRT bool + imply PCI_DEVICES + imply VFIO_AMD_XGBE + imply VFIO_XGMAC + select A15MPCORE + select ACPI + select ARM_SMMUV3 + select GPIO_KEY + select FW_CFG_DMA + select PCI_EXPRESS + select PCI_EXPRESS_GENERIC_BRIDGE + select PFLASH_CFI01 + select PL011 # UART + select PL031 # RTC + select PL061 # GPIO + select PLATFORM_BUS + select SMBIOS + select VIRTIO_MMIO + select VFIO_PLATFORM =20 config CHEETAH bool @@ -314,6 +332,7 @@ config A9MPCORE =20 config A15MPCORE bool + select ARM_GIC =20 config ARM11MPCORE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 053fcb6..f17187f 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,4 +1,5 @@ -obj-y +=3D boot.o sysbus-fdt.o +obj-y +=3D boot.o +obj-$(CONFIG_PLATFORM_BUS) +=3D sysbus-fdt.o obj-$(CONFIG_ARM_VIRT) +=3D virt.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o obj-$(CONFIG_DIGIC) +=3D digic_boards.o --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049180037434.90747633680894; Wed, 13 Feb 2019 01:13:00 -0800 (PST) Received: from localhost ([127.0.0.1]:53486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqbA-0003G0-1l for importer@patchew.org; Wed, 13 Feb 2019 04:12:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG2-0002Kh-NR for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4v-0005xg-Dw for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48000) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4l-0005iL-KH; Wed, 13 Feb 2019 03:39:30 -0500 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 0D9DD89AE0; Wed, 13 Feb 2019 08:39:19 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8792710021B6; Wed, 13 Feb 2019 08:39:16 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:07 +0100 Message-Id: <1550047098-1210-15-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.26]); Wed, 13 Feb 2019 08:39:19 +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 v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Netduino only depends on the stm32f205 SoC which in turn depends on its components. Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis --- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 9db6808..3279fb5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -24,25 +24,18 @@ CONFIG_TOSA=3Dy CONFIG_Z2=3Dy CONFIG_COLLIE=3Dy CONFIG_ASPEED_SOC=3Dy +CONFIG_NETDUINO2=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy =20 -CONFIG_NETDUINO2=3Dy - CONFIG_FRAMEBUFFER=3Dy =20 CONFIG_DIGIC=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_STM32F2XX_TIMER=3Dy -CONFIG_STM32F2XX_USART=3Dy -CONFIG_STM32F2XX_SYSCFG=3Dy -CONFIG_STM32F2XX_ADC=3Dy -CONFIG_STM32F2XX_SPI=3Dy -CONFIG_STM32F205_SOC=3Dy CONFIG_NRF51_SOC=3Dy =20 CONFIG_CMSDK_APB_TIMER=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3d580fa..5d7dafb 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -81,6 +81,7 @@ config MUSICPAL =20 config NETDUINO2 bool + select STM32F205_SOC =20 config NSERIES bool @@ -262,6 +263,12 @@ config RASPI =20 config STM32F205_SOC bool + select ARM_V7M + select STM32F2XX_TIMER + select STM32F2XX_USART + select STM32F2XX_SYSCFG + select STM32F2XX_ADC + select STM32F2XX_SPI =20 config XLNX_ZYNQMP_ARM bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155004894416521.917586137297008; Wed, 13 Feb 2019 01:09:04 -0800 (PST) Received: from localhost ([127.0.0.1]:53417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqXJ-0008OO-1d for importer@patchew.org; Wed, 13 Feb 2019 04:08:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG1-00023s-81 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4v-0005y4-KV for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45344) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4r-0005jJ-7H; Wed, 13 Feb 2019 03:39:33 -0500 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 C8D5F356F3; Wed, 13 Feb 2019 08:39:21 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7405F10021B6; Wed, 13 Feb 2019 08:39:19 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:08 +0100 Message-Id: <1550047098-1210-16-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.30]); Wed, 13 Feb 2019 08:39:21 +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 v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add dependencies for the Cubitech Cubieboard. Note that CONFIG_AHCI has a hard dependency on CONFIG_PCI currently, so PCI is now always selected by AHCI, even for boards that only want to use AHCI via a sysbus device. We should break up that dependency later by splitting ahci.c into sysbus and pci parts. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 9 +++++++++ hw/ide/Kconfig | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3279fb5..28bb37f 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ARM_V7M=3Dy =20 CONFIG_ARM_VIRT=3Dy +CONFIG_CUBIEBOARD=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -28,7 +29,6 @@ CONFIG_NETDUINO2=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy =20 CONFIG_FRAMEBUFFER=3Dy @@ -55,10 +55,6 @@ CONFIG_IOTKIT_SYSCTL=3Dy CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy =20 -CONFIG_ALLWINNER_A10_PIT=3Dy -CONFIG_ALLWINNER_A10_PIC=3Dy -CONFIG_ALLWINNER_A10=3Dy - CONFIG_FSL_IMX6=3Dy CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 5d7dafb..3d78102 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -24,6 +24,10 @@ config CHEETAH select OMAP select TSC210X =20 +config CUBIEBOARD + bool + select ALLWINNER_A10 + config DIGIC bool select PTIMER @@ -257,6 +261,11 @@ config EXYNOS4 =20 config ALLWINNER_A10 bool + select AHCI + select ALLWINNER_A10_PIT + select ALLWINNER_A10_PIC + select ALLWINNER_EMAC + select SERIAL =20 config RASPI bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index ab47b6a..c457f60 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -45,7 +45,7 @@ config MICRODRIVE config AHCI bool default y if PCI_DEVICES - depends on PCI + select PCI # TODO: Split up ahci.c into sysbus and pci = parts select IDE_QDEV =20 config IDE_SII3112 --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048801690795.0632413782808; Wed, 13 Feb 2019 01:06:41 -0800 (PST) Received: from localhost ([127.0.0.1]:53392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqV2-0006hQ-Js for importer@patchew.org; Wed, 13 Feb 2019 04:06:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG1-0002Kh-Ie for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4v-0005y9-MX for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56008) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4r-0005mQ-Aw; Wed, 13 Feb 2019 03:39:34 -0500 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 D476CC04B94F; Wed, 13 Feb 2019 08:39:27 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FD0110021B6; Wed, 13 Feb 2019 08:39:22 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:09 +0100 Message-Id: <1550047098-1210-17-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.31]); Wed, 13 Feb 2019 08:39:27 +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 v2 16/25] hw/arm: Express dependencies of the MPS2 boards 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the mps2-an* machines. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 19 +------------------ hw/arm/Kconfig | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 28bb37f..b530a06 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -26,6 +26,7 @@ CONFIG_Z2=3Dy CONFIG_COLLIE=3Dy CONFIG_ASPEED_SOC=3Dy CONFIG_NETDUINO2=3Dy +CONFIG_MPS2=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy @@ -34,27 +35,9 @@ CONFIG_IMX_FEC=3Dy CONFIG_FRAMEBUFFER=3Dy =20 CONFIG_DIGIC=3Dy -CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_NRF51_SOC=3Dy =20 -CONFIG_CMSDK_APB_TIMER=3Dy -CONFIG_CMSDK_APB_DUALTIMER=3Dy -CONFIG_CMSDK_APB_UART=3Dy -CONFIG_CMSDK_APB_WATCHDOG=3Dy - -CONFIG_MPS2_FPGAIO=3Dy -CONFIG_MPS2_SCC=3Dy - -CONFIG_TZ_MPC=3Dy -CONFIG_TZ_MSC=3Dy -CONFIG_TZ_PPC=3Dy -CONFIG_ARMSSE=3Dy -CONFIG_IOTKIT_SECCTL=3Dy -CONFIG_IOTKIT_SYSCTL=3Dy -CONFIG_IOTKIT_SYSINFO=3Dy -CONFIG_ARMSSE_CPUID=3Dy - CONFIG_FSL_IMX6=3Dy CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3d78102..d17bd2f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -314,6 +314,23 @@ config ASPEED_SOC =20 config MPS2 bool + select ARMSSE + select ARMSSE_CPUID + select CMSDK_APB_TIMER + select CMSDK_APB_DUALTIMER + select CMSDK_APB_UART + select CMSDK_APB_WATCHDOG + select IOTKIT_SECCTL + select IOTKIT_SYSCTL + select IOTKIT_SYSINFO + select LAN9118 + select MPS2_FPGAIO + select MPS2_SCC + select PL022 # Serial port + select PL080 # DMA controller + select TZ_MPC + select TZ_MSC + select TZ_PPC =20 config IOTKIT bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048144719385.69330002551067; Wed, 13 Feb 2019 00:55:44 -0800 (PST) Received: from localhost ([127.0.0.1]:53189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqKT-0005v8-Fw for importer@patchew.org; Wed, 13 Feb 2019 03:55:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG0-00024X-SH for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4w-0005z4-IS for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57738) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4t-0005nx-AH; Wed, 13 Feb 2019 03:39:37 -0500 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 1ECC881F18; Wed, 13 Feb 2019 08:39:30 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4830710021B6; Wed, 13 Feb 2019 08:39:28 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:10 +0100 Message-Id: <1550047098-1210-18-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.27]); Wed, 13 Feb 2019 08:39:30 +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 v2 17/25] hw/arm: Express dependencies of the raspi 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Most of the code is directly controlled by the CONFIG_RASPI switch, so not much to add here additionally. Note that CONFIG_SDHCI currently has a hard requirement for PCI, so we select that switch now always there instead of depending on it. We should split up sdhci.c into sysbus and pci parts later to get rid of this hard requirement. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 3 +++ hw/sd/Kconfig | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index b530a06..6605786 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -27,15 +27,13 @@ CONFIG_COLLIE=3Dy CONFIG_ASPEED_SOC=3Dy CONFIG_NETDUINO2=3Dy CONFIG_MPS2=3Dy +CONFIG_RASPI=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_IMX_FEC=3Dy =20 -CONFIG_FRAMEBUFFER=3Dy - CONFIG_DIGIC=3Dy -CONFIG_RASPI=3Dy CONFIG_NRF51_SOC=3Dy =20 CONFIG_FSL_IMX6=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d17bd2f..bb385a5 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -269,6 +269,9 @@ config ALLWINNER_A10 =20 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI =20 config STM32F205_SOC bool diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 864f535..29e359b 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -13,5 +13,5 @@ config SD config SDHCI bool default y if PCI_DEVICES - depends on PCI + select PCI # TODO: Split up sdhci.c into sysbus and pci = parts select SD --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550049009850141.65351244242686; Wed, 13 Feb 2019 01:10:09 -0800 (PST) Received: from localhost ([127.0.0.1]:53423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqYM-0000oN-P0 for importer@patchew.org; Wed, 13 Feb 2019 04:10:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG1-000256-3x for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4w-0005zG-LA for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44044) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4v-0005uM-9V; Wed, 13 Feb 2019 03:39:37 -0500 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 6982599CE1; Wed, 13 Feb 2019 08:39:35 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id A87BB10021B6; Wed, 13 Feb 2019 08:39:30 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:11 +0100 Message-Id: <1550047098-1210-19-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 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.38]); Wed, 13 Feb 2019 08:39:35 +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 v2 18/25] hw/arm: Express dependencies of canon-a1100 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the DIGIC / canon-a1100 machine. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 2 +- hw/arm/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 6605786..20fcbcb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -28,12 +28,12 @@ CONFIG_ASPEED_SOC=3Dy CONFIG_NETDUINO2=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy +CONFIG_DIGIC=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_IMX_FEC=3Dy =20 -CONFIG_DIGIC=3Dy CONFIG_NRF51_SOC=3Dy =20 CONFIG_FSL_IMX6=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index bb385a5..80a3b1f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -31,6 +31,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 =20 config EXYNOS4 bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048742490272.80402332508334; Wed, 13 Feb 2019 01:05:42 -0800 (PST) Received: from localhost ([127.0.0.1]:53356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqU7-00062Q-CB for importer@patchew.org; Wed, 13 Feb 2019 04:05:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqG0-0002Kh-Fu for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq4y-000611-Mx for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38274) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq4x-0005ys-2s; Wed, 13 Feb 2019 03:39:39 -0500 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 4A86EC058CB7; Wed, 13 Feb 2019 08:39:38 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF17010021B6; Wed, 13 Feb 2019 08:39:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:12 +0100 Message-Id: <1550047098-1210-20-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.32]); Wed, 13 Feb 2019 08:39:38 +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 v2 19/25] hw/arm: Express dependencies of sabrelite 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the Sabrelite / iMX6 machine. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 20fcbcb..f6193b1 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -29,6 +29,7 @@ CONFIG_NETDUINO2=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_DIGIC=3Dy +CONFIG_SABRELITE=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy @@ -36,13 +37,10 @@ CONFIG_IMX_FEC=3Dy =20 CONFIG_NRF51_SOC=3Dy =20 -CONFIG_FSL_IMX6=3Dy CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy =20 -CONFIG_IMX_I2C=3Dy - CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 80a3b1f..70fc73f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -184,6 +184,10 @@ config REALVIEW select DS1338 # I2C RTC+NVRAM select USB_OHCI =20 +config SABRELITE + bool + select FSL_IMX6 + config STELLARIS bool select ARM_V7M @@ -302,6 +306,9 @@ config FSL_IMX31 =20 config FSL_IMX6 bool + select A9MPCORE + select IMX + select IMX_I2C =20 config ASPEED_SOC bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index f17187f..ee9f5c6 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -22,6 +22,7 @@ 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 +obj-$(CONFIG_SABRELITE) +=3D sabrelite.o =20 obj-$(CONFIG_ARM_V7M) +=3D armv7m.o obj-$(CONFIG_EXYNOS4) +=3D exynos4210.o @@ -36,7 +37,7 @@ obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx-zynqmp.o xlnx-zcu= 102.o obj-$(CONFIG_XLNX_VERSAL) +=3D xlnx-versal.o xlnx-versal-virt.o obj-$(CONFIG_FSL_IMX25) +=3D fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) +=3D fsl-imx31.o kzm.o -obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o sabrelite.o +obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) +=3D mps2.o obj-$(CONFIG_MPS2) +=3D mps2-tz.o --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155004857759050.39764985511613; Wed, 13 Feb 2019 01:02:57 -0800 (PST) Received: from localhost ([127.0.0.1]:53325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqRS-0003dI-H7 for importer@patchew.org; Wed, 13 Feb 2019 04:02:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFz-00021O-RZ for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq51-00062O-36 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq50-00061H-1a; Wed, 13 Feb 2019 03:39:42 -0500 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 2E6B086675; Wed, 13 Feb 2019 08:39:41 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id D72CE10021B6; Wed, 13 Feb 2019 08:39:38 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:13 +0100 Message-Id: <1550047098-1210-21-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.26]); Wed, 13 Feb 2019 08:39:41 +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 v2 20/25] hw/arm: Express dependencies of the MSF2 machine 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the emcraft-sf2 machine - we also distinguis between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 8 ++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index f6193b1..5eceeba 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -30,9 +30,9 @@ CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_DIGIC=3Dy CONFIG_SABRELITE=3Dy +CONFIG_EMCRAFT_SF2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_SSI_M25P80=3Dy CONFIG_IMX_FEC=3Dy =20 CONFIG_NRF51_SOC=3Dy @@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy -CONFIG_MSF2=3Dy CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 70fc73f..cebb410 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -358,9 +358,17 @@ config FSL_IMX6UL config NRF51_SOC bool =20 +config EMCRAFT_SF2 + bool + select MSF2 + select SSI_M25P80 + config MSF2 bool + select ARM_V7M select PTIMER + select SERIAL + select SSI =20 config ZAURUS bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index ee9f5c6..29dc7d9 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) +=3D virt.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o obj-$(CONFIG_DIGIC) +=3D digic_boards.o obj-$(CONFIG_EXYNOS4) +=3D exynos4_boards.o +obj-$(CONFIG_EMCRAFT_SF2) +=3D msf2-som.o obj-$(CONFIG_HIGHBANK) +=3D highbank.o obj-$(CONFIG_INTEGRATOR) +=3D integratorcp.o obj-$(CONFIG_MAINSTONE) +=3D mainstone.o @@ -41,7 +42,7 @@ obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) +=3D mps2.o obj-$(CONFIG_MPS2) +=3D mps2-tz.o -obj-$(CONFIG_MSF2) +=3D msf2-soc.o msf2-som.o +obj-$(CONFIG_MSF2) +=3D msf2-soc.o obj-$(CONFIG_ARMSSE) +=3D armsse.o obj-$(CONFIG_FSL_IMX7) +=3D fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) +=3D smmu-common.o smmuv3.o --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155004804003817.0712247730728; Wed, 13 Feb 2019 00:54:00 -0800 (PST) Received: from localhost ([127.0.0.1]:53167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqIl-0004Ic-U3 for importer@patchew.org; Wed, 13 Feb 2019 03:53:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFz-0002Kh-Gg for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq59-000692-KY for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56136) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq55-00064E-Gn; Wed, 13 Feb 2019 03:39:49 -0500 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 49F1EC04B926; Wed, 13 Feb 2019 08:39:46 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D39610021B6; Wed, 13 Feb 2019 08:39:41 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:14 +0100 Message-Id: <1550047098-1210-22-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.31]); Wed, 13 Feb 2019 08:39:46 +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 v2 21/25] hw/arm: Express dependencies for remaining IMX boards 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 5eceeba..ebe5de6 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -33,7 +33,6 @@ CONFIG_SABRELITE=3Dy CONFIG_EMCRAFT_SF2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_IMX_FEC=3Dy =20 CONFIG_NRF51_SOC=3Dy =20 @@ -45,4 +44,3 @@ CONFIG_PCIE_PORT=3Dy CONFIG_XIO3130=3Dy CONFIG_IOH3420=3Dy CONFIG_I82801B11=3Dy -CONFIG_PCI_EXPRESS_DESIGNWARE=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index cebb410..c2fba8e 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -295,6 +295,10 @@ config XLNX_VERSAL =20 config FSL_IMX25 bool + select IMX + select IMX_FEC + select IMX_I2C + select DS1338 =20 config FSL_IMX31 bool @@ -309,6 +313,7 @@ config FSL_IMX6 select A9MPCORE select IMX select IMX_I2C + select SDHCI =20 config ASPEED_SOC bool @@ -348,12 +353,25 @@ config IOTKIT =20 config FSL_IMX7 bool + imply PCI_DEVICES + select A15MPCORE + select PCI + select IMX + select IMX_FEC + select IMX_I2C + select PCI_EXPRESS_DESIGNWARE + select SDHCI =20 config ARM_SMMUV3 bool =20 config FSL_IMX6UL bool + select A15MPCORE + select IMX + select IMX_FEC + select IMX_I2C + select SDHCI =20 config NRF51_SOC bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048362282112.75887314471322; Wed, 13 Feb 2019 00:59:22 -0800 (PST) Received: from localhost ([127.0.0.1]:53254 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqO1-0000Vh-5s for importer@patchew.org; Wed, 13 Feb 2019 03:59:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFy-00021O-NG for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq5D-0006Ey-K9 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38442) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq58-00066F-TQ; Wed, 13 Feb 2019 03:39:51 -0500 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 430F8C06A814; Wed, 13 Feb 2019 08:39:49 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1DB71024904; Wed, 13 Feb 2019 08:39:46 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:15 +0100 Message-Id: <1550047098-1210-23-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.32]); Wed, 13 Feb 2019 08:39:49 +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 v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the NRF51 / microbit machine. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 6 ++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index ebe5de6..c1bc6ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -31,11 +31,10 @@ CONFIG_RASPI=3Dy CONFIG_DIGIC=3Dy CONFIG_SABRELITE=3Dy CONFIG_EMCRAFT_SF2=3Dy +CONFIG_MICROBIT=3Dy =20 CONFIG_VGA=3Dy =20 -CONFIG_NRF51_SOC=3Dy - CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c2fba8e..3d96d1b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -373,8 +373,14 @@ config FSL_IMX6UL select IMX_I2C select SDHCI =20 +config MICROBIT + bool + select NRF51_SOC + config NRF51_SOC bool + select I2C + select ARM_V7M =20 config EMCRAFT_SF2 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 29dc7d9..88b90ca 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) +=3D msf2-som.o obj-$(CONFIG_HIGHBANK) +=3D highbank.o obj-$(CONFIG_INTEGRATOR) +=3D integratorcp.o obj-$(CONFIG_MAINSTONE) +=3D mainstone.o +obj-$(CONFIG_MICROBIT) +=3D microbit.o obj-$(CONFIG_MUSICPAL) +=3D musicpal.o obj-$(CONFIG_NETDUINO2) +=3D netduino2.o obj-$(CONFIG_NSERIES) +=3D nseries.o @@ -47,4 +48,4 @@ obj-$(CONFIG_ARMSSE) +=3D armsse.o obj-$(CONFIG_FSL_IMX7) +=3D fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) +=3D smmu-common.o smmuv3.o obj-$(CONFIG_FSL_IMX6UL) +=3D fsl-imx6ul.o mcimx6ul-evk.o -obj-$(CONFIG_NRF51_SOC) +=3D nrf51_soc.o microbit.o +obj-$(CONFIG_NRF51_SOC) +=3D nrf51_soc.o --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048506632825.4493103415068; Wed, 13 Feb 2019 01:01:46 -0800 (PST) Received: from localhost ([127.0.0.1]:53320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqQG-0002ms-J7 for importer@patchew.org; Wed, 13 Feb 2019 04:01:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFy-00025D-K8 for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq5E-0006Fe-Do for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53578) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq5B-00069y-Hi; Wed, 13 Feb 2019 03:39:55 -0500 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 23AED3DDB3; Wed, 13 Feb 2019 08:39:52 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC28C10021B6; Wed, 13 Feb 2019 08:39:49 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:16 +0100 Message-Id: <1550047098-1210-24-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.29]); Wed, 13 Feb 2019 08:39:52 +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 v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This cleans up most settings in default-configs/aarch64-softmmu.mak. Signed-off-by: Thomas Huth --- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-= softmmu.mak index 4ea9add..3a4b15e 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -3,10 +3,6 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak =20 -CONFIG_AUX=3Dy -CONFIG_DDC=3Dy -CONFIG_DPCD=3Dy -CONFIG_XLNX_ZYNQMP=3Dy CONFIG_XLNX_ZYNQMP_ARM=3Dy CONFIG_XLNX_VERSAL=3Dy CONFIG_ARM_SMMUV3=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3d96d1b..721cc07 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -289,6 +289,17 @@ config STM32F205_SOC =20 config XLNX_ZYNQMP_ARM bool + select AHCI + select ARM_GIC + select CADENCE + select DDC + select DPCD + select SDHCI + select SSI + select SSI_M25P80 + select XILINX_AXI + select XILINX_SPIPS + select XLNX_ZYNQMP =20 config XLNX_VERSAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index a5f3fc0..d2ae2f1 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -108,3 +108,4 @@ config VIRTIO_VGA =20 config DPCD bool + select AUX --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048184308547.2064448022875; Wed, 13 Feb 2019 00:56:24 -0800 (PST) Received: from localhost ([127.0.0.1]:53226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqL4-0006SP-7P for importer@patchew.org; Wed, 13 Feb 2019 03:56:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFy-000256-Id for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq5E-0006Fv-Rh for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:39:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq5D-0006ES-UT; Wed, 13 Feb 2019 03:39:56 -0500 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 3191DC058CB7; Wed, 13 Feb 2019 08:39:55 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC02110021B6; Wed, 13 Feb 2019 08:39:52 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:17 +0100 Message-Id: <1550047098-1210-25-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.32]); Wed, 13 Feb 2019 08:39:55 +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 v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt machine 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Dependencies have been determined with trial-and-error and by looking at the xlnx-versal.c source file. Signed-off-by: Thomas Huth --- hw/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 721cc07..027c063 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -303,6 +303,10 @@ config XLNX_ZYNQMP_ARM =20 config XLNX_VERSAL bool + select ARM_GIC + select PL011 + select CADENCE + select VIRTIO_MMIO =20 config FSL_IMX25 bool --=20 1.8.3.1 From nobody Sat Nov 8 05:53:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550048318178990.7689406977242; Wed, 13 Feb 2019 00:58:38 -0800 (PST) Received: from localhost ([127.0.0.1]:53252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqNJ-0008Nx-3h for importer@patchew.org; Wed, 13 Feb 2019 03:58:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51907) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtqFs-00024X-3p for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:51:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtq5H-0006I6-Rg for qemu-devel@nongnu.org; Wed, 13 Feb 2019 03:40:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gtq5H-0006Gd-1Q; Wed, 13 Feb 2019 03:39:59 -0500 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 480EB89AD9; Wed, 13 Feb 2019 08:39:58 +0000 (UTC) Received: from thuth.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDA25101E841; Wed, 13 Feb 2019 08:39:55 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Wed, 13 Feb 2019 09:38:18 +0100 Message-Id: <1550047098-1210-26-git-send-email-thuth@redhat.com> In-Reply-To: <1550047098-1210-1-git-send-email-thuth@redhat.com> References: <1550047098-1210-1-git-send-email-thuth@redhat.com> 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.26]); Wed, 13 Feb 2019 08:39:58 +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 v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices 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: Peter Maydell , qemu-arm@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The PCI devices should be pulled in by default if PCI_DEVICES is set, so there is no need anymore to enforce them in the configs file. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 8 -------- 1 file changed, 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index c1bc6ac..19c84ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -32,14 +32,6 @@ CONFIG_DIGIC=3Dy CONFIG_SABRELITE=3Dy CONFIG_EMCRAFT_SF2=3Dy CONFIG_MICROBIT=3Dy - -CONFIG_VGA=3Dy - CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy CONFIG_FSL_IMX6UL=3Dy - -CONFIG_PCIE_PORT=3Dy -CONFIG_XIO3130=3Dy -CONFIG_IOH3420=3Dy -CONFIG_I82801B11=3Dy --=20 1.8.3.1