From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:6000:188:0:0:0:0 with SMTP id p8csp7207593wrx; Thu, 7 Mar 2019 06:30:00 -0800 (PST) X-Google-Smtp-Source: APXvYqyUmJzJq/NZlJk+ddu+HM3kUB8335dTvPieZicdZcjgg+IcrjJhqdPiF6VondDgy0Mz+bVg X-Received: by 2002:a25:4cc5:: with SMTP id z188mr11521421yba.94.1551969000026; Thu, 07 Mar 2019 06:30:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551969000; cv=none; d=google.com; s=arc-20160816; b=r9yiZe0VP1w2X7qaSFryvAqUsJzZkUiUsaXNDD9wH1IoR0S6MY+WSgBTLY+0ptngRV uWSdiZ+2jgTdy/gdsF0EuF31h4hrA05ZGXtY+JmZKkxSB4UqVbHSuKcIXGSbJYklvNOr 5PTcQFOhdD92RRZuiKXKwK6NaweFY+FlifQIjLmHcbySv6pVjSFPEtWLdl92dSIgTtMv VEGXifGsz6kEHDHZsoqnj9jjIXjMCWHM7yIfNDVH/hbeJTKwP0lPuVgmCYf7shyj2Nj3 pLcQNoiRpvZ6RkhEmknDCt0wYL9rsg7vnM0GLfK36IKV1WayKBHYw+dxba0DH5yHRWCV eXeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=yoDPkvp7XaCu1bIe3+7pHQwk4eZNCh5tbhvz3AAGp7M=; b=owzvBv3iwDX//t/jk+hFZBquk+pQ7faBq8r1TaV3qd40iKIZMrxzdRm45oIuXcH5GQ F0ZU6XNlMGrK1Q83hPGYJt6W7HHVEXExO0+NUkkLhZvshcjBFI1AgDDT1DnPTUOEj1Xp mxFyP6oclO9q+80913kJE1/3fFLQdxvyMByoxF2aWYddqY2EySrOnlnYGKtpX9b/K+e2 oQ98TyiGIxrAhOl6wr63bheo2K1Puq5wp9fV46E8q0+kYEElos+aYyaeoJEAxI0jpRr4 6XYK+Pm8Va76cG2TVvdaqlvuUBk4yy6J6SaaLM8JD7ulyyqqtg4Mi02FnM+rSByYguDG dlFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a3si277804ybh.302.2019.03.07.06.29.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 07 Mar 2019 06:30:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:52723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u23-0005fZ-EI for alex.bennee@linaro.org; Thu, 07 Mar 2019 09:29:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tt6-0005ca-9u for qemu-arm@nongnu.org; Thu, 07 Mar 2019 09:20:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tt5-0000Wl-GU for qemu-arm@nongnu.org; Thu, 07 Mar 2019 09:20:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49412) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tt5-0000Vx-7N; Thu, 07 Mar 2019 09:20:43 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F35E3099D56; Thu, 7 Mar 2019 14:20:42 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52F685C1B5; Thu, 7 Mar 2019 14:20:37 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:37 +0100 Message-Id: <1551968334-18982-13-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 07 Mar 2019 14:20:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-arm] [PATCH v4 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig X-BeenThere: qemu-arm@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 , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 4NwuGD8Ru4nc 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 | 15 +++++--------- hw/arm/Kconfig | 43 +++++++++++++++++++++++++++++++++++= ++++++ hw/arm/Makefile.objs | 5 ++++- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 41df0af..f3ac12c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,22 +16,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 @@ -39,16 +37,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 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2a82a4f..1a3ad0f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -51,6 +51,9 @@ config INTEGRATOR =20 config MAINSTONE bool + select PXA2XX + select PFLASH_CFI01 + select SMC91C111 =20 config MUSICPAL bool @@ -90,6 +93,44 @@ 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 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 @@ -222,6 +263,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 bd0b45a..00328d1 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 mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tt8-0005eT-84 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tt7-0000YL-B7 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:46 -0500 From: Thomas Huth Date: Thu, 7 Mar 2019 15:18:37 +0100 Message-Id: <1551968334-18982-13-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, John Snow , "Michael S. Tsirkin" , Peter Maydell 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 | 15 +++++--------- hw/arm/Kconfig | 43 +++++++++++++++++++++++++++++++++++= ++++++ hw/arm/Makefile.objs | 5 ++++- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 41df0af..f3ac12c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,22 +16,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 @@ -39,16 +37,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 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2a82a4f..1a3ad0f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -51,6 +51,9 @@ config INTEGRATOR =20 config MAINSTONE bool + select PXA2XX + select PFLASH_CFI01 + select SMC91C111 =20 config MUSICPAL bool @@ -90,6 +93,44 @@ 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 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 @@ -222,6 +263,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 bd0b45a..00328d1 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