From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:adf:9061:0:0:0:0:0 with SMTP id h88csp1429774wrh; Sun, 5 May 2019 06:59:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxeg658GNcGZGWlI3filkZBoejEpVxcyW/N7KOmQD5UafZx9QuDiClzKAvFrKmXaIu4E2qA X-Received: by 2002:a1c:a103:: with SMTP id k3mr13614651wme.8.1557064792895; Sun, 05 May 2019 06:59:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557064792; cv=none; d=google.com; s=arc-20160816; b=qxe5NLvr9zYRKx2q3EzGxPnwLoPhX2zUZeiCWKbkYh81cuWX+u6hP8MjFxi7z88wDb 5Ca/6J7RQM2Ta2NPRSnNJAmFq9K7+XzvWlFCTWbg4AjnILTwNKU2c0JATrO1uvD8qlPy afJVcjn9N/vigiuJ3iblPKtZpYLR0stRT5jRwyQ7hfMgizbEghHbE/000vvsh9HIzwc/ hUePwQKqd1h+AYOHssMRd7qn2c8PIzyqqcptxv9FTFKWCIb9WIrXHDrtBXJZizbmmz/n twHG90xUf7mToSloQR3oo25Yatul6NeNWbLpegDFDroqQ3wAiZK3ZTLA+HaQiB/9URdR DFMQ== 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=qET51TsX4NM7rciRMjIpqvvwNSpmI/yktBTY1qFawjw=; b=pfpBlAeH41GxkZVU8pojuM09hd9kjPK1nv71Vd1z/S1VEct8UC3IGhgXJmg/hr/Erg rAmx9SxAjLDfHuWgbEUr+3XzJDSerIBQ5o3npUlU/RHsqBmRZikVs49ahbGex5Xvsucg LqsqAVty8WtnKgz60O/ljjZT3PRuKHTvq6+sRdeCXcsmBg22BZXqjWirhhbn9VPJIRI+ IDwS9Em5FDKa/9rmSJT+XyPO8/0a7u/7Nu8oNPopxeYhxgb5NnEtjndy7gqNmY8ijozF zinVLSoxzN0j0ORN7hfL6Fop+923xUgYtRASioGdy0coIfPvR2BI6UVRdWIfbTZw7iC9 jluQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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 33si5860215wrg.140.2019.05.05.06.59.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 05 May 2019 06:59:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-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-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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]:41366 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNHgG-0005TE-1G for alex.bennee@linaro.org; Sun, 05 May 2019 09:59:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNHdx-00048R-RU for qemu-devel@nongnu.org; Sun, 05 May 2019 09:57:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNHdw-0004dK-Tc for qemu-devel@nongnu.org; Sun, 05 May 2019 09:57:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNHdu-0004ao-Q9; Sun, 05 May 2019 09:57:26 -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 2375446233; Sun, 5 May 2019 13:57:26 +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 16E2060C5F; Sun, 5 May 2019 13:57:24 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Sun, 5 May 2019 15:56:51 +0200 Message-Id: <20190505135714.11277-6-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.29]); Sun, 05 May 2019 13:57:26 +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] [PULL 05/28] 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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: Nleqx0zOegfR 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 | 8 +------- hw/arm/Kconfig | 8 ++++++++ hw/display/Kconfig | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmm= u.mak index 50a4be3cad..6195b75f48 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=3Dy =20 CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy +CONFIG_INTEGRATOR=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -33,7 +34,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 @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=3Dy CONFIG_NETDUINO2=3Dy =20 CONFIG_PL041=3Dy -CONFIG_PL050=3Dy CONFIG_PL080=3Dy -CONFIG_PL110=3Dy -CONFIG_PL181=3Dy CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=3Dy CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 -CONFIG_INTEGRATOR=3Dy -CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -32,6 +32,14 @@ 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 SMC91C111 =20 config MAINSTONE bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 72be57a403..a11815c9af 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 2.21.0