From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:9061:0:0:0:0:0 with SMTP id h88csp1431405wrh; Sun, 5 May 2019 07:01:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwUZ4cdZ9uUfYZ/65Q1gF9DTHW+rU31UN/0+18rNyJu31K38+WwZlLyBXtGSODsyy5LT6n8 X-Received: by 2002:adf:f70a:: with SMTP id r10mr14133908wrp.96.1557064892240; Sun, 05 May 2019 07:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557064892; cv=none; d=google.com; s=arc-20160816; b=ZWeJp4GyI0X+GTsmaDTDRwEmfFJmxsgwn190sR2RLK8PD4yZJbz734LAkCl8IL3SK0 afGVWHsGCnvOFAI2c5Du6H7kt6N6tZ+5w0VICAPBxkUh/zyvexSPsgKHOctlKw9kePK3 KOPRjBOigu4CxtJSbPbOx2+cvTRw3FZlgkbfAaanVisagM3qknk5uYGx/LdvD0ba1yxH /Tie1SxpOb4L5JaqYjMxCFgfaOPcBdiXQL3s8JTKKAKJNEfiN5B68wHAXBQB0RkH2aXG DHS+yyl5NkY9WkJ/+77FN2ajIEWekFAZkvLOm1ONvpT5XmazTuhJpi3xsAyBxi/tAnd5 0fkg== 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=qbCyrMzQ20T7brPrCKIaAo/PKoldbL0VzF2NqbsKD3Q=; b=Q4QtFHtjHtJRwK0Y69jjpKdPmoWgncafR0lLwZfvrVzZ3wJGWiryK8hKip8K8NWyWk 3WgoKRUmVDnvz5gKY8mnYldXGDfBbRpnzNqVEilZFybI4D9zFYPJN8JjG4rT+9tHXlv9 fJmI+lgBUnkJvHLlAUR23oxissk2iufnkdGtdccai0IOmqcXXeOdUuoTuuNQMNj1hVoh 6OoWyJUb5vLQQrdrLXbzEBiIB/fiyk5vJ8Sc27c16JLaqfphAkxyS4X/lGGaPVmXgJD+ cuqAlltCQD9xkyhpOLWN9SThRC4HkMLdHAKLJkMbuhp/8JV6C/oR3N1ZR/dSAeXefhlb 67kA== 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 r4si1233248wrm.373.2019.05.05.07.01.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 05 May 2019 07:01:32 -0700 (PDT) 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]:41432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNHhr-0007sy-4b for alex.bennee@linaro.org; Sun, 05 May 2019 10:01:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNHe0-0004B8-Ha for qemu-arm@nongnu.org; Sun, 05 May 2019 09:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNHdz-0004fc-8e for qemu-arm@nongnu.org; Sun, 05 May 2019 09:57:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNHdz-0004ey-1P; Sun, 05 May 2019 09:57:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 53420CA1FE; Sun, 5 May 2019 13:57:30 +0000 (UTC) Received: from thuth.com (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4692A60C67; Sun, 5 May 2019 13:57:29 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Sun, 5 May 2019 15:56:54 +0200 Message-Id: <20190505135714.11277-9-thuth@redhat.com> In-Reply-To: <20190505135714.11277-1-thuth@redhat.com> References: <20190505135714.11277-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Sun, 05 May 2019 13:57:30 +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] [PULL 08/28] hw/arm: Express dependencies of the OMAP 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: qemu-arm@nongnu.org Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: lW/qWbW6zUPU 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). Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 17 ++++------------- hw/arm/Kconfig | 25 +++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 0a4d293f8a..b7ed3c530b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -12,16 +12,16 @@ CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_FSL_IMX31=3Dy CONFIG_MUSICPAL=3Dy +CONFIG_MUSCA=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 @@ -39,9 +39,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,15 +59,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_MUSCA=3Dy -CONFIG_NSERIES=3Dy CONFIG_RASPI=3Dy CONFIG_REALVIEW=3Dy CONFIG_ZAURUS=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b9f3c3c232..71126254ff 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -2,6 +2,11 @@ config ARM_VIRT bool imply VFIO_PLATFORM =20 +config CHEETAH + bool + select OMAP + select TSC210X + config DIGIC bool select PTIMER @@ -58,9 +63,25 @@ 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 SD + select SERIAL =20 config PXA2XX bool @@ -74,6 +95,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 fa57c7c770..8302b8df1d 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 2.21.0