From patchwork Tue Apr 30 07:14:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 1093081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44tYVt2Y1Qz9s7T for ; Tue, 30 Apr 2019 17:46:14 +1000 (AEST) Received: from localhost ([127.0.0.1]:40889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNSt-0006q6-Lx for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2019 03:46:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2w-0001Jg-LG for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN2u-00061Z-Nu for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN2p-0005zx-3F; Tue, 30 Apr 2019 03:19:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E997821F3; Tue, 30 Apr 2019 07:19:14 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CA451001DD2; Tue, 30 Apr 2019 07:19:04 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:02 +0200 Message-Id: <20190430071405.16714-28-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-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]); Tue, 30 Apr 2019 07:19:14 +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 v6 27/30] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This cleans up most settings in default-configs/aarch64-softmmu.mak. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 313490fb38..49ff415ee4 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -3,9 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_AUX=y -CONFIG_DDC=y -CONFIG_DPCD=y -CONFIG_XLNX_ZYNQMP=y CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index da091ac217..eff61efab9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -279,6 +279,17 @@ config STM32F205_SOC 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 config XLNX_VERSAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 0577e68c8e..bb95f8d6a4 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -108,6 +108,7 @@ config VIRTIO_VGA config DPCD bool + select AUX config ATI_VGA bool