From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555610638; cv=none; d=zoho.com; s=zohoarc; b=JwAwPAZaUSOcU9VgBQdup9h355U406p8l9+nm3a/jIl03CUGcStDTH3BOUY+OmTEYUS/zQdj3VQ57lhbO1BT8YmmjFzvqjjiMBq/QYJbecT30oFHdnRVMjhQNZwp892ysYqYjIuYicNoNuluKF4mPWghoAqcNMcz6k9B8QPcL0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555610638; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ycnEk3xc0T0Mb/MUNcG2DvWiUTVrPLNBDAGj/G9uIjo=; b=lNi89DHyCDKB3uxeFaRvkMzapAMpp8Om6D+atSWbjKsrqK422wvGblb5kHcPOUmSVfr9G2rpqYbxmP8Azv4tr+rsF2T0mw7N2AHIhHMuuen1s567BljnQa4SSEYxUpZOezsDsfU011+zKW3x/y+9IBVA/fNgMOYXUF4RT3QC5l0= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555610638504981.1735030269875; Thu, 18 Apr 2019 11:03:58 -0700 (PDT) Received: from localhost ([127.0.0.1]:45029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNy-0003hi-Dq for importer@patchew.org; Thu, 18 Apr 2019 14:03:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBLh-0002SZ-7J for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:01:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBLg-0001Ih-7H for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:01:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56278) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBLY-0001E6-WC; Thu, 18 Apr 2019 14:01:17 -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 E17D23019880; Thu, 18 Apr 2019 18:01:15 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EFF61018A0E; Thu, 18 Apr 2019 18:01:10 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:29 +0200 Message-Id: <20190418180057.3593-2-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.47]); Thu, 18 Apr 2019 18:01:16 +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 for-QEMU-4.1 v5 01/29] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs 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" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some machines have an AHCI adapter, but no PCI. To be able to compile hw/ide/ahci.c without CONFIG_PCI, we still need the two functions msi_enabled() and msi_notify() for linking. This is required for the new Kconfig-like build system, if a user wants to compile a QEMU binary with just one machine that has AHCI, but no PCI, like the ARM "cubieboard" for example. Reviewed-by: Michael S. Tsirkin Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c index b941a0e842..c04a5df651 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev) g_assert(false); return 0; } + +/* Required by ahci.c */ +bool msi_enabled(const PCIDevice *dev) +{ + return false; +} + +void msi_notify(PCIDevice *dev, unsigned int vector) +{ + g_assert_not_reached(); +} --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611221; cv=none; d=zoho.com; s=zohoarc; b=Z0cS+FEvOwXo/eQ6nf70gpEgwe1VVHdTaYA0QpZ44kG9nWbfRjfJzPejNja4yBvJ0+8OS7mFl3p4qPP9YXODhZ7D75dwYHB/7+DgZOnN27+moK1xZ15vyX48sciz11+PojjIPMt2Ji23NrtDAd2Ri595OzpG4YTxiZVtk52CdNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611221; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=M4kdVwZYTuEW5yKLv3vYlunkkcFXX3Y/qHg8rjkGnEQ=; b=H8yX0BIOWw3EWBk0deL/ND5lOmyQxtEOIVjJdj9YalhmWKVPzccDe1/5WCxB9TmVB8WAVfCXIJDJ+Di02HM7DBJ+5AkhdlIQ46N+jLyrhc9OrA83RwFfBvCmzBmOHvkxVWDmQxhJeidnm/A3G7UaJfMaq3yJKh+n7LjOhmaNyxQ= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611221371304.5641504639199; Thu, 18 Apr 2019 11:13:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:45211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBXW-0003aD-AM for importer@patchew.org; Thu, 18 Apr 2019 14:13:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMQ-0002xS-0r for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMN-0001ig-RO for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMA-0001MS-LH; Thu, 18 Apr 2019 14:01:54 -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 C6F95C05681F; Thu, 18 Apr 2019 18:01:29 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 324D21001E98; Thu, 18 Apr 2019 18:01:16 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:30 +0200 Message-Id: <20190418180057.3593-3-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.32]); Thu, 18 Apr 2019 18:01: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-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device 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" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI sysbus device, but do not use CONFIG_PCI since they do not feature a PCI bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails: ../hw/ide/ich.o: In function `pci_ich9_ahci_realize': hw/ide/ich.c:124: undefined reference to `pci_allocate_irq' hw/ide/ich.c:126: undefined reference to `pci_register_bar' hw/ide/ich.c:128: undefined reference to `pci_register_bar' hw/ide/ich.c:131: undefined reference to `pci_add_capability' hw/ide/ich.c:147: undefined reference to `msi_init' ../hw/ide/ich.o: In function `pci_ich9_uninit': hw/ide/ich.c:158: undefined reference to `msi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_d= evice' We must only compile ich.c if CONFIG_PCI is available, too, so introduce a new config switch for this device. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/ide/Kconfig | 6 +++++- hw/ide/Makefile.objs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index ab47b6a7a3..5d9106b1ac 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -43,10 +43,14 @@ config MICRODRIVE select IDE_QDEV =20 config AHCI + bool + select IDE_QDEV + +config AHCI_ICH9 bool default y if PCI_DEVICES depends on PCI - select IDE_QDEV + select AHCI =20 config IDE_SII3112 bool diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index a142add90e..faf04e0209 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) +=3D mmio.o common-obj-$(CONFIG_IDE_VIA) +=3D via.o common-obj-$(CONFIG_MICRODRIVE) +=3D microdrive.o common-obj-$(CONFIG_AHCI) +=3D ahci.o -common-obj-$(CONFIG_AHCI) +=3D ich.o +common-obj-$(CONFIG_AHCI_ICH9) +=3D ich.o common-obj-$(CONFIG_ALLWINNER_A10) +=3D ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) +=3D sii3112.o --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555610847; cv=none; d=zoho.com; s=zohoarc; b=A81pVymLo++JBfYCpxvRxFFYqie6er7gDazHrIDxKKQed2b01DWAqlTjFGuP7rdjTswRzvORgNnj6+IR6JVN8rYtHZg/+uxbvnsA9cZ5RjejDb2UaMJJuW6GfasxZ+OhWh7gX7zXOJqxPYmTVtTqgFmR5V7F/76EV+FUaDTvFw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555610847; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=S/vVobhM5P43Ljq/MxciHrCzQ2IsuEHoXQH5W6CgJIM=; b=jUNJ1OUBsr2OGOQvhk9REG7jlnjypr2q2CDSbwr9RP3TXVQ435qeWFgyekMqx7pUGtsZ3SGv8LIyoOEKYran7h6SBPAjWy/gdxLB7XbVTDxDdl7vg3eBSCHemd+7P4733J72ZGD0D/nB0B12oH8KcFzXZV8BvS/ZJDzaNt6EgD4= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555610847338198.2601426694896; Thu, 18 Apr 2019 11:07:27 -0700 (PDT) Received: from localhost ([127.0.0.1]:45102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBRU-0006gn-4X for importer@patchew.org; Thu, 18 Apr 2019 14:07:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMV-00033P-Ql for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMO-0001ja-UH for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBM2-0001PM-Fm; Thu, 18 Apr 2019 14:01:48 -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 EF0D4550CF; Thu, 18 Apr 2019 18:01:34 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C7A31001E98; Thu, 18 Apr 2019 18:01:29 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:31 +0200 Message-Id: <20190418180057.3593-4-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.29]); Thu, 18 Apr 2019 18:01: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 for-QEMU-4.1 v5 03/29] hw/usb/hcd-ohci: Move PCI-related code into a separate file 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" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Some machines (like the pxa2xx-based ARM machines) only have a sysbus OHCI controller, but no PCI. With the new Kconfig-style build system, it will soon be possible to create QEMU binaries that only contain such PCI-less machines. However, the two OHCI controllers, for sysbus and for PCI, are currently both located in one file, so the PCI code is still required for linking here. Move the OHCI-PCI device code into a separate file, so that it is possible to use the sysbus OHCI device also without the PCI dependency. Apart from moving code to a new file (and a new header), this patch might also fix one subtle bug: The ohci_die() function always assumed to be running with a OHCI-PCI controller and called some PCI-specific functions - but if I got the code right, ohci_die() might also get called for the sysbus-OHCI device, so it likely failed in that case. I've changed this part of the code now, so that there are two ohci_die() implementations now, one for sysbus and one for PCI. Signed-off-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/Kconfig | 6 +- hw/usb/Makefile.objs | 1 + hw/usb/hcd-ohci-pci.c | 166 ++++++++++++++++++++++++++++ hw/usb/hcd-ohci.c | 244 +++--------------------------------------- hw/usb/hcd-ohci.h | 132 +++++++++++++++++++++++ 5 files changed, 321 insertions(+), 228 deletions(-) create mode 100644 hw/usb/hcd-ohci-pci.c create mode 100644 hw/usb/hcd-ohci.h diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index a1b7acb12a..564305e283 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -8,10 +8,14 @@ config USB_UHCI select USB =20 config USB_OHCI + bool + select USB + +config USB_OHCI_PCI bool default y if PCI_DEVICES depends on PCI - select USB + select USB_OHCI =20 config USB_EHCI bool diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 2b929649ac..81688f6e70 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -5,6 +5,7 @@ common-obj-$(CONFIG_USB) +=3D desc.o desc-msos.o # usb host adapters common-obj-$(CONFIG_USB_UHCI) +=3D hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) +=3D hcd-ohci.o +common-obj-$(CONFIG_USB_OHCI_PCI) +=3D hcd-ohci-pci.o common-obj-$(CONFIG_USB_EHCI) +=3D hcd-ehci.o hcd-ehci-pci.o common-obj-$(CONFIG_USB_EHCI_SYSBUS) +=3D hcd-ehci.o hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) +=3D hcd-xhci.o diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c new file mode 100644 index 0000000000..e972df35c9 --- /dev/null +++ b/hw/usb/hcd-ohci-pci.c @@ -0,0 +1,166 @@ +/* + * QEMU USB OHCI Emulation + * Copyright (c) 2004 Gianni Tedesco + * Copyright (c) 2006 CodeSourcery + * Copyright (c) 2006 Openedhand Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "qemu/osdep.h" +#include "hw/hw.h" +#include "qapi/error.h" +#include "qemu/timer.h" +#include "hw/usb.h" +#include "hw/pci/pci.h" +#include "hw/sysbus.h" +#include "hw/qdev-dma.h" +#include "trace.h" +#include "hcd-ohci.h" + +#define TYPE_PCI_OHCI "pci-ohci" +#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI) + +typedef struct { + /*< private >*/ + PCIDevice parent_obj; + /*< public >*/ + + OHCIState state; + char *masterbus; + uint32_t num_ports; + uint32_t firstport; +} OHCIPCIState; + +/** + * A typical O/EHCI will stop operating, set itself into error state + * (which can be queried by MMIO) and will set PERR in its config + * space to signal that it got an error + */ +static void ohci_pci_die(OHCIState *ohci) +{ + OHCIPCIState *dev =3D container_of(ohci, OHCIPCIState, state); + + trace_usb_ohci_die(); + + ohci_set_interrupt(ohci, OHCI_INTR_UE); + ohci_bus_stop(ohci); + pci_set_word(dev->parent_obj.config + PCI_STATUS, + PCI_STATUS_DETECTED_PARITY); +} + +static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp) +{ + Error *err =3D NULL; + OHCIPCIState *ohci =3D PCI_OHCI(dev); + + dev->config[PCI_CLASS_PROG] =3D 0x10; /* OHCI */ + dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ + + usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0, + ohci->masterbus, ohci->firstport, + pci_get_address_space(dev), ohci_pci_die, &err); + if (err) { + error_propagate(errp, err); + return; + } + + ohci->state.irq =3D pci_allocate_irq(dev); + pci_register_bar(dev, 0, 0, &ohci->state.mem); +} + +static void usb_ohci_exit(PCIDevice *dev) +{ + OHCIPCIState *ohci =3D PCI_OHCI(dev); + OHCIState *s =3D &ohci->state; + + trace_usb_ohci_exit(s->name); + ohci_bus_stop(s); + + if (s->async_td) { + usb_cancel_packet(&s->usb_packet); + s->async_td =3D 0; + } + ohci_stop_endpoints(s); + + if (!ohci->masterbus) { + usb_bus_release(&s->bus); + } + + timer_del(s->eof_timer); + timer_free(s->eof_timer); +} + +static void usb_ohci_reset_pci(DeviceState *d) +{ + PCIDevice *dev =3D PCI_DEVICE(d); + OHCIPCIState *ohci =3D PCI_OHCI(dev); + OHCIState *s =3D &ohci->state; + + ohci_hard_reset(s); +} + +static Property ohci_pci_properties[] =3D { + DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus), + DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3), + DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static const VMStateDescription vmstate_ohci =3D { + .name =3D "ohci", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState), + VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCISta= te), + VMSTATE_END_OF_LIST() + } +}; + +static void ohci_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + + k->realize =3D usb_ohci_realize_pci; + k->exit =3D usb_ohci_exit; + k->vendor_id =3D PCI_VENDOR_ID_APPLE; + k->device_id =3D PCI_DEVICE_ID_APPLE_IPID_USB; + k->class_id =3D PCI_CLASS_SERIAL_USB; + set_bit(DEVICE_CATEGORY_USB, dc->categories); + dc->desc =3D "Apple USB Controller"; + dc->props =3D ohci_pci_properties; + dc->hotpluggable =3D false; + dc->vmsd =3D &vmstate_ohci; + dc->reset =3D usb_ohci_reset_pci; +} + +static const TypeInfo ohci_pci_info =3D { + .name =3D TYPE_PCI_OHCI, + .parent =3D TYPE_PCI_DEVICE, + .instance_size =3D sizeof(OHCIPCIState), + .class_init =3D ohci_pci_class_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void ohci_pci_register_types(void) +{ + type_register_static(&ohci_pci_info); +} + +type_init(ohci_pci_register_types) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 81cf5ab7a5..343816d561 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -30,86 +30,19 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "hw/usb.h" -#include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" #include "trace.h" +#include "hcd-ohci.h" =20 /* This causes frames to occur 1000x slower */ //#define OHCI_TIME_WARP 1 =20 -/* Number of Downstream Ports on the root hub. */ - -#define OHCI_MAX_PORTS 15 - #define ED_LINK_LIMIT 32 =20 static int64_t usb_frame_time; static int64_t usb_bit_time; =20 -typedef struct OHCIPort { - USBPort port; - uint32_t ctrl; -} OHCIPort; - -typedef struct { - USBBus bus; - qemu_irq irq; - MemoryRegion mem; - AddressSpace *as; - uint32_t num_ports; - const char *name; - - QEMUTimer *eof_timer; - int64_t sof_time; - - /* OHCI state */ - /* Control partition */ - uint32_t ctl, status; - uint32_t intr_status; - uint32_t intr; - - /* memory pointer partition */ - uint32_t hcca; - uint32_t ctrl_head, ctrl_cur; - uint32_t bulk_head, bulk_cur; - uint32_t per_cur; - uint32_t done; - int32_t done_count; - - /* Frame counter partition */ - uint16_t fsmps; - uint8_t fit; - uint16_t fi; - uint8_t frt; - uint16_t frame_number; - uint16_t padding; - uint32_t pstart; - uint32_t lst; - - /* Root Hub partition */ - uint32_t rhdesc_a, rhdesc_b; - uint32_t rhstatus; - OHCIPort rhport[OHCI_MAX_PORTS]; - - /* PXA27x Non-OHCI events */ - uint32_t hstatus; - uint32_t hmask; - uint32_t hreset; - uint32_t htest; - - /* SM501 local memory offset */ - dma_addr_t localmem_base; - - /* Active packets. */ - uint32_t old_ctl; - USBPacket usb_packet; - uint8_t usb_buf[8192]; - uint32_t async_td; - bool async_complete; - -} OHCIState; - /* Host Controller Communications Area */ struct ohci_hcca { uint32_t intr[32]; @@ -122,7 +55,6 @@ struct ohci_hcca { #define ED_WBACK_OFFSET offsetof(struct ohci_ed, head) #define ED_WBACK_SIZE 4 =20 -static void ohci_bus_stop(OHCIState *ohci); static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev); =20 /* Bitfields for the first word of an Endpoint Desciptor. */ @@ -229,16 +161,6 @@ struct ohci_iso_td { #define OHCI_STATUS_OCR (1<<3) #define OHCI_STATUS_SOC ((1<<6)|(1<<7)) =20 -#define OHCI_INTR_SO (1U<<0) /* Scheduling overrun */ -#define OHCI_INTR_WD (1U<<1) /* HcDoneHead writeback */ -#define OHCI_INTR_SF (1U<<2) /* Start of frame */ -#define OHCI_INTR_RD (1U<<3) /* Resume detect */ -#define OHCI_INTR_UE (1U<<4) /* Unrecoverable error */ -#define OHCI_INTR_FNO (1U<<5) /* Frame number overflow */ -#define OHCI_INTR_RHSC (1U<<6) /* Root hub status change */ -#define OHCI_INTR_OC (1U<<30) /* Ownership change */ -#define OHCI_INTR_MIE (1U<<31) /* Master Interrupt Enable */ - #define OHCI_HCCA_SIZE 0x100 #define OHCI_HCCA_MASK 0xffffff00 =20 @@ -302,25 +224,9 @@ struct ohci_iso_td { =20 #define OHCI_HRESET_FSBIR (1 << 0) =20 -static void ohci_die(OHCIState *ohci); - -/* Update IRQ levels */ -static inline void ohci_intr_update(OHCIState *ohci) +static inline void ohci_die(OHCIState *ohci) { - int level =3D 0; - - if ((ohci->intr & OHCI_INTR_MIE) && - (ohci->intr_status & ohci->intr)) - level =3D 1; - - qemu_set_irq(ohci->irq, level); -} - -/* Set an interrupt */ -static inline void ohci_set_interrupt(OHCIState *ohci, uint32_t intr) -{ - ohci->intr_status |=3D intr; - ohci_intr_update(ohci); + ohci->ohci_die(ohci); } =20 /* Attach or detach a device on a root hub port. */ @@ -426,7 +332,7 @@ static USBDevice *ohci_find_device(OHCIState *ohci, uin= t8_t addr) return NULL; } =20 -static void ohci_stop_endpoints(OHCIState *ohci) +void ohci_stop_endpoints(OHCIState *ohci) { USBDevice *dev; int i, j; @@ -498,7 +404,7 @@ static void ohci_soft_reset(OHCIState *ohci) ohci->lst =3D OHCI_LS_THRESH; } =20 -static void ohci_hard_reset(OHCIState *ohci) +void ohci_hard_reset(OHCIState *ohci) { ohci_soft_reset(ohci); ohci->ctl =3D 0; @@ -1372,7 +1278,7 @@ static int ohci_bus_start(OHCIState *ohci) } =20 /* Stop sending SOF tokens on the bus */ -static void ohci_bus_stop(OHCIState *ohci) +void ohci_bus_stop(OHCIState *ohci) { trace_usb_ohci_stop(ohci->name); timer_del(ohci->eof_timer); @@ -1852,15 +1758,16 @@ static USBPortOps ohci_port_ops =3D { static USBBusOps ohci_bus_ops =3D { }; =20 -static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, - uint32_t num_ports, dma_addr_t localmem_base, - char *masterbus, uint32_t firstport, - AddressSpace *as, Error **errp) +void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports, + dma_addr_t localmem_base, char *masterbus, + uint32_t firstport, AddressSpace *as, + void (*ohci_die_func)(OHCIState *ohci), Error **errp) { Error *err =3D NULL; int i; =20 ohci->as =3D as; + ohci->ohci_die =3D ohci_die_func; =20 if (num_ports > OHCI_MAX_PORTS) { error_setg(errp, "OHCI num-ports=3D%u is too big (limit is %u port= s)", @@ -1919,85 +1826,16 @@ static void usb_ohci_init(OHCIState *ohci, DeviceSt= ate *dev, ohci_frame_boundary, ohci); } =20 -#define TYPE_PCI_OHCI "pci-ohci" -#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI) - -typedef struct { - /*< private >*/ - PCIDevice parent_obj; - /*< public >*/ - - OHCIState state; - char *masterbus; - uint32_t num_ports; - uint32_t firstport; -} OHCIPCIState; - -/** A typical O/EHCI will stop operating, set itself into error state - * (which can be queried by MMIO) and will set PERR in its config - * space to signal that it got an error +/** + * A typical O/EHCI will stop operating, set itself into error state + * (which can be queried by MMIO) to signal that it got an error */ -static void ohci_die(OHCIState *ohci) +static void ohci_sysbus_die(OHCIState *ohci) { - OHCIPCIState *dev =3D container_of(ohci, OHCIPCIState, state); - trace_usb_ohci_die(); =20 ohci_set_interrupt(ohci, OHCI_INTR_UE); ohci_bus_stop(ohci); - pci_set_word(dev->parent_obj.config + PCI_STATUS, - PCI_STATUS_DETECTED_PARITY); -} - -static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp) -{ - Error *err =3D NULL; - OHCIPCIState *ohci =3D PCI_OHCI(dev); - - dev->config[PCI_CLASS_PROG] =3D 0x10; /* OHCI */ - dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ - - usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0, - ohci->masterbus, ohci->firstport, - pci_get_address_space(dev), &err); - if (err) { - error_propagate(errp, err); - return; - } - - ohci->state.irq =3D pci_allocate_irq(dev); - pci_register_bar(dev, 0, 0, &ohci->state.mem); -} - -static void usb_ohci_exit(PCIDevice *dev) -{ - OHCIPCIState *ohci =3D PCI_OHCI(dev); - OHCIState *s =3D &ohci->state; - - trace_usb_ohci_exit(s->name); - ohci_bus_stop(s); - - if (s->async_td) { - usb_cancel_packet(&s->usb_packet); - s->async_td =3D 0; - } - ohci_stop_endpoints(s); - - if (!ohci->masterbus) { - usb_bus_release(&s->bus); - } - - timer_del(s->eof_timer); - timer_free(s->eof_timer); -} - -static void usb_ohci_reset_pci(DeviceState *d) -{ - PCIDevice *dev =3D PCI_DEVICE(d); - OHCIPCIState *ohci =3D PCI_OHCI(dev); - OHCIState *s =3D &ohci->state; - - ohci_hard_reset(s); } =20 #define TYPE_SYSBUS_OHCI "sysbus-ohci" @@ -2023,7 +1861,7 @@ static void ohci_realize_pxa(DeviceState *dev, Error = **errp) =20 usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, s->masterbus, s->firstport, - &address_space_memory, &err); + &address_space_memory, ohci_sysbus_die, &err); if (err) { error_propagate(errp, err); return; @@ -2040,13 +1878,6 @@ static void usb_ohci_reset_sysbus(DeviceState *dev) ohci_hard_reset(ohci); } =20 -static Property ohci_pci_properties[] =3D { - DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus), - DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3), - DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0), - DEFINE_PROP_END_OF_LIST(), -}; - static const VMStateDescription vmstate_ohci_state_port =3D { .name =3D "ohci-core/port", .version_id =3D 1, @@ -2075,7 +1906,7 @@ static const VMStateDescription vmstate_ohci_eof_time= r =3D { }, }; =20 -static const VMStateDescription vmstate_ohci_state =3D { +const VMStateDescription vmstate_ohci_state =3D { .name =3D "ohci-core", .version_id =3D 1, .minimum_version_id =3D 1, @@ -2122,46 +1953,6 @@ static const VMStateDescription vmstate_ohci_state = =3D { } }; =20 -static const VMStateDescription vmstate_ohci =3D { - .name =3D "ohci", - .version_id =3D 1, - .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { - VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState), - VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCISta= te), - VMSTATE_END_OF_LIST() - } -}; - -static void ohci_pci_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - - k->realize =3D usb_ohci_realize_pci; - k->exit =3D usb_ohci_exit; - k->vendor_id =3D PCI_VENDOR_ID_APPLE; - k->device_id =3D PCI_DEVICE_ID_APPLE_IPID_USB; - k->class_id =3D PCI_CLASS_SERIAL_USB; - set_bit(DEVICE_CATEGORY_USB, dc->categories); - dc->desc =3D "Apple USB Controller"; - dc->props =3D ohci_pci_properties; - dc->hotpluggable =3D false; - dc->vmsd =3D &vmstate_ohci; - dc->reset =3D usb_ohci_reset_pci; -} - -static const TypeInfo ohci_pci_info =3D { - .name =3D TYPE_PCI_OHCI, - .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(OHCIPCIState), - .class_init =3D ohci_pci_class_init, - .interfaces =3D (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - static Property ohci_sysbus_properties[] =3D { DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus), DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3), @@ -2190,7 +1981,6 @@ static const TypeInfo ohci_sysbus_info =3D { =20 static void ohci_register_types(void) { - type_register_static(&ohci_pci_info); type_register_static(&ohci_sysbus_info); } =20 diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h new file mode 100644 index 0000000000..481ceba7ff --- /dev/null +++ b/hw/usb/hcd-ohci.h @@ -0,0 +1,132 @@ +/* + * QEMU USB OHCI Emulation + * Copyright (c) 2004 Gianni Tedesco + * Copyright (c) 2006 CodeSourcery + * Copyright (c) 2006 Openedhand Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#ifndef HCD_OHCI_H +#define HCD_OHCI_H + +#include "sysemu/dma.h" + +/* Number of Downstream Ports on the root hub: */ +#define OHCI_MAX_PORTS 15 + +typedef struct OHCIPort { + USBPort port; + uint32_t ctrl; +} OHCIPort; + +typedef struct OHCIState { + USBBus bus; + qemu_irq irq; + MemoryRegion mem; + AddressSpace *as; + uint32_t num_ports; + const char *name; + + QEMUTimer *eof_timer; + int64_t sof_time; + + /* OHCI state */ + /* Control partition */ + uint32_t ctl, status; + uint32_t intr_status; + uint32_t intr; + + /* memory pointer partition */ + uint32_t hcca; + uint32_t ctrl_head, ctrl_cur; + uint32_t bulk_head, bulk_cur; + uint32_t per_cur; + uint32_t done; + int32_t done_count; + + /* Frame counter partition */ + uint16_t fsmps; + uint8_t fit; + uint16_t fi; + uint8_t frt; + uint16_t frame_number; + uint16_t padding; + uint32_t pstart; + uint32_t lst; + + /* Root Hub partition */ + uint32_t rhdesc_a, rhdesc_b; + uint32_t rhstatus; + OHCIPort rhport[OHCI_MAX_PORTS]; + + /* PXA27x Non-OHCI events */ + uint32_t hstatus; + uint32_t hmask; + uint32_t hreset; + uint32_t htest; + + /* SM501 local memory offset */ + dma_addr_t localmem_base; + + /* Active packets. */ + uint32_t old_ctl; + USBPacket usb_packet; + uint8_t usb_buf[8192]; + uint32_t async_td; + bool async_complete; + + void (*ohci_die)(struct OHCIState *ohci); +} OHCIState; + +extern const VMStateDescription vmstate_ohci_state; + +#define OHCI_INTR_SO (1U << 0) /* Scheduling overrun */ +#define OHCI_INTR_WD (1U << 1) /* HcDoneHead writeback */ +#define OHCI_INTR_SF (1U << 2) /* Start of frame */ +#define OHCI_INTR_RD (1U << 3) /* Resume detect */ +#define OHCI_INTR_UE (1U << 4) /* Unrecoverable error */ +#define OHCI_INTR_FNO (1U << 5) /* Frame number overflow */ +#define OHCI_INTR_RHSC (1U << 6) /* Root hub status change */ +#define OHCI_INTR_OC (1U << 30) /* Ownership change */ +#define OHCI_INTR_MIE (1U << 31) /* Master Interrupt Enable */ + +/* Update IRQ levels */ +static inline void ohci_intr_update(OHCIState *ohci) +{ + int level =3D 0; + + if ((ohci->intr & OHCI_INTR_MIE) && + (ohci->intr_status & ohci->intr)) + level =3D 1; + + qemu_set_irq(ohci->irq, level); +} + +/* Set an interrupt */ +static inline void ohci_set_interrupt(OHCIState *ohci, uint32_t intr) +{ + ohci->intr_status |=3D intr; + ohci_intr_update(ohci); +} + +void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports, + dma_addr_t localmem_base, char *masterbus, + uint32_t firstport, AddressSpace *as, + void (*ohci_die_func)(OHCIState *ohci), Error **errp); +void ohci_hard_reset(OHCIState *ohci); +void ohci_bus_stop(OHCIState *ohci); +void ohci_stop_endpoints(OHCIState *ohci); + +#endif --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611059; cv=none; d=zoho.com; s=zohoarc; b=QNC+FAh2BXIfVyxxU5YfaePx/SIbb2gBS6hn0K/4f23LTqDdRnQatImE3V2bS7A/Vbe7QKWM9t254nJ/d5Jc7EnAVog1P3y+7V6Cgx79qn6JFrM0ZtsxImMDyvuorOJ57OI5L1nH4/e4UxwBSRKAMvOwhhQHtsBhiqARw9VpOv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=K3Bo8kykHcutMJkV5aPqxRzSXxlWPOPR8M9KumZIu5I=; b=XGMloI8OB2VjrQz1gAoS1JCYzDBEJTJL0Qooe3TI60So3HhUqZYml0Pmscryu9QvjxuWhgWecrdOIcZ1LHHlkIUNAc5fNu5OypBfGjZCTufTybO6m8CK2euaFnK8dgeX3kQGGJ+Sw4DIAdlRBm+l3k0uEmhJ3fJYol5wVKOfVCw= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611059586411.8188762934634; Thu, 18 Apr 2019 11:10:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:45182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBUo-00015h-DO for importer@patchew.org; Thu, 18 Apr 2019 14:10:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45667) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMQ-0002xR-0m for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMN-0001im-RW for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMA-0001T2-5l; Thu, 18 Apr 2019 14:01:54 -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 DE4C3307CB2F; Thu, 18 Apr 2019 18:01:41 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4352D1001DEF; Thu, 18 Apr 2019 18:01:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:32 +0200 Message-Id: <20190418180057.3593-5-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.42]); Thu, 18 Apr 2019 18:01: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-devel] [PATCH for-QEMU-4.1 v5 04/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 613d19a06d..2a11e76cc7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,14 @@ # Default configuration for arm-softmmu =20 +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=3Dy + CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_PCI_TESTDEV=3Dy + +CONFIG_EXYNOS4=3Dy + CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -26,7 +32,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 @@ -36,21 +41,15 @@ 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 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 @@ -61,11 +60,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 @@ -73,7 +70,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 @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=3Dy CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 -CONFIG_SDHCI=3Dy CONFIG_INTEGRATOR=3Dy CONFIG_INTEGRATOR_DEBUG=3Dy =20 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d298fbdc89..acd07b2add 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -8,7 +8,13 @@ config DIGIC =20 config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS =20 config HIGHBANK bool @@ -104,6 +110,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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611415; cv=none; d=zoho.com; s=zohoarc; b=BGtLfZ3tj5zbMS8Ul0hjBdSdP5JCBf+jJdNa0Q5uL3ZVeyPEyU8kvdS2oF/YcMnvyh4zT2B4grPPjGiDA6V7fVRWIRyOwPzU9e2HJfdgMO3v9yJKl2ButIG1aTNvBT5HJOh+hUdjgzVfYSh37SMc2ywfGV5vYjTH5w6MiJ92SZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611415; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=plR/hT4EAt/NxOrJzeeDLyytLXROqB9jZgjYtFT0maA=; b=mWfiBmhOVSisugJgYdCd7Ryn5HMlCjj8J8BZHImcpAhRgEd43dszECtAH+gmtP3Bm7EY+KvZj06/se7FmivWvWVfbpDZAJvMpYLjEtpn/ybYOuAdovQ8JRMK0R+AKLDaQh6/6fvtQ+X9/MqUnPMTNDHdf5s+4jgSB9In+bAdoGk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611415214999.8949969175527; Thu, 18 Apr 2019 11:16:55 -0700 (PDT) Received: from localhost ([127.0.0.1]:45279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBaK-00066e-U1 for importer@patchew.org; Thu, 18 Apr 2019 14:16:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMQ-0002xT-10 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMN-0001ik-RU for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMB-0001ZL-1P; Thu, 18 Apr 2019 14:01:55 -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 C00F23132C29; Thu, 18 Apr 2019 18:01:53 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B1E11001DC8; Thu, 18 Apr 2019 18:01:42 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:33 +0200 Message-Id: <20190418180057.3593-6-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.49]); Thu, 18 Apr 2019 18:01:54 +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 for-QEMU-4.1 v5 05/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 2a11e76cc7..50a4be3cad 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=3Dy CONFIG_PCI_TESTDEV=3Dy =20 CONFIG_EXYNOS4=3Dy +CONFIG_HIGHBANK=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -45,24 +46,17 @@ CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 CONFIG_ARM11MPCORE=3Dy -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_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 @@ -150,7 +144,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 acd07b2add..0ba377ac18 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -18,6 +18,17 @@ config EXYNOS4 =20 config HIGHBANK bool + select A9MPCORE + select A15MPCORE + select AHCI + select ARM_TIMER # sp804 + select ARM_V7M + 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555610678; cv=none; d=zoho.com; s=zohoarc; b=UxDeWE1R8zcc7t92ObLATiVyaema0KDxNQK0LgZAJ+tz7sT0KKASauFiWr/P0Eo/XDBD/tw8ptR1EfWCvVU08gboG0S557s7rd9Ti8mpUv4Exl1OQmOBNqI75C+0tVzlqELxE6Lnnd94KRlLDRBKSM470du4TezQ58fBFl6hdHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555610678; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=s5yegeW8BLWnuk9MNsGktoIa/O4Gfji02MqgYY0e4OY=; b=bW/pQfLhYhXC7l9M/uIMWkrkgjhTVgg65gWVYoP6DcxaB2ECYSp3JdRTBk7lUcwMMyFgT2oDsIvUmBsp9GZCT1tvr62u+YA1Fp/76mOHoIwxkf/pb0tj0Xc1Te+UeVMwxgQx9paF5LuCrKEs5x6r3JYUsvOym/E+HB2ZW/OS6aY= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555610678924636.5319435953139; Thu, 18 Apr 2019 11:04:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:45033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOi-0004OO-Vl for importer@patchew.org; Thu, 18 Apr 2019 14:04:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMa-00035J-AX for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMZ-0001t4-7I for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMJ-0001fj-At; Thu, 18 Apr 2019 14:02:05 -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 42E7188AB1; Thu, 18 Apr 2019 18:02:02 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11A881001F41; Thu, 18 Apr 2019 18:01:53 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:34 +0200 Message-Id: <20190418180057.3593-7-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.26]); Thu, 18 Apr 2019 18:02:02 +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 for-QEMU-4.1 v5 06/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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-softmmu.= 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 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611590; cv=none; d=zoho.com; s=zohoarc; b=n7+bS4XP+Y2goxTR8rmytPfgqfNK8wvVjBGGeGCjnwHymFUS7H3RRYsX1Vffa9qYHmlz5Pnv35oCvdv9qBgxn6goHe5qusVujRkloepDwBy9Zs4/adHYtnPexpm3IEyDNfuNjvef3iloDr0S+eBXlMiGMmRMgZfkuRcgatjfJq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611590; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7hN1C+Jqee6gi5FDXqo2fEcbpm3QKzqYxzjRtvTJH5w=; b=Hr6mlcrp2Rn17T7O1SWTqx7SEBRv2XRoRN+QLq/Xkwl7ZaFR0uHfysMzRe5wcyKBY54HclBMrGiheYnfTHNfo+OUPSkfVbXfZUaWd2b/T3p8JDAx5zpLM9h6BF8H8VKlzaU0D6X9sl5k1aPpJ08sKxc0mFEkvxmuJxiOnLD1oLg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611590829246.2234404680769; Thu, 18 Apr 2019 11:19:50 -0700 (PDT) Received: from localhost ([127.0.0.1]:45313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBdQ-000062-OD for importer@patchew.org; Thu, 18 Apr 2019 14:19:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMe-0003C0-W2 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMd-0001vV-BA for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51700) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMX-0001r7-LC; Thu, 18 Apr 2019 14:02:17 -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 8FD5330018FE; Thu, 18 Apr 2019 18:02:16 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C0631001DC8; Thu, 18 Apr 2019 18:02:02 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:35 +0200 Message-Id: <20190418180057.3593-8-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.46]); Thu, 18 Apr 2019 18:02:16 +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 for-QEMU-4.1 v5 07/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Peter Chubb Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 4 ++++ hw/misc/Kconfig | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 6195b75f48..7f94811ccb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=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_MUSCA=3Dy @@ -115,7 +115,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 ad3b1f9b40..9087b7d714 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -98,6 +98,10 @@ config FSL_IMX25 =20 config FSL_IMX31 bool + select SERIAL + select IMX + select IMX_I2C + select LAN9118 =20 config FSL_IMX6 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 5f67d0d6d9..385e1b0cec 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611071; cv=none; d=zoho.com; s=zohoarc; b=jmSqnFXw+ZGZSazsRMjvUk/cbBy9pUT7vc5UYMYUDXD8Xm5IRF3thSqRoiy7mUQ+HZkQK3Td2gNjy+57oxyTycclQGTFn6L75KNmWVYA9be6Yl9AenSceoOwdIH1wzsAj3W7S573HimqFxyYWwrJ23Hr95I2wKUOlhWlIva09GE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611071; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=T547wZ0Zji/IQ2PfijVhNF+KZj/GJuCdxyMX5lmFg5Q=; b=k7lvnwtiq7Ij4G/xgqhFSU7vi4BG+n6Z1kGHimfA+ugh6bK7Iunphr76lHaLPkW8/6zsZl3e1NVmnTj8mEVpJ8B0lY0GvjV1/ycDbxTjJmhM3+++uamSEZWjrv06IlPMySyX0Zm9ZG9wNNq8r3r4O7cVxQT77/WdMz46Aclu3fc= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15556110710091012.811457597513; Thu, 18 Apr 2019 11:11:11 -0700 (PDT) Received: from localhost ([127.0.0.1]:45187 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBV5-0001Q3-V7 for importer@patchew.org; Thu, 18 Apr 2019 14:11:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMm-0003GG-11 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMl-00022k-1u for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46532) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMd-0001ut-Bb; Thu, 18 Apr 2019 14:02:23 -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 945213076C60; Thu, 18 Apr 2019 18:02:21 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5DE11001E9D; Thu, 18 Apr 2019 18:02:16 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:36 +0200 Message-Id: <20190418180057.3593-9-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.48]); Thu, 18 Apr 2019 18:02:21 +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 for-QEMU-4.1 v5 08/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 7f94811ccb..0a4d293f8a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -11,13 +11,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 @@ -40,7 +40,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 @@ -137,7 +134,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 9087b7d714..b9f3c3c232 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -46,7 +46,12 @@ config MAINSTONE =20 config MUSICPAL bool + select BITBANG_I2C + select MARVELL_88W8618 select PTIMER + select PFLASH_CFI02 + select SERIAL + select WM8750 =20 config NETDUINO2 bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611247; cv=none; d=zoho.com; s=zohoarc; b=YjKtUJWtvDbpEq6n19jWCnWWkJ+iz2fg9VGwImr7+dtq4bHUotGwYuCvlUawvEyytCGONsV4hEZ4B5cm4nkGfejbv4qoH4IBSzUaXD+7iSZWj4ZNosRd43xmgZoZcgC/ZkJQaazgSL7IP3FsVBiivEq9GzrJHINsQ9XVQUtdUGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611247; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=4QveAJ75IV99Wo72EXjH0UigEuuLOua+GCdTNHtaGT0=; b=jt2CeY0EjP3JoXxYDtMpOaldx6p9i0c25t53x+bE9HubH24IIzSW81xvhyo8Q++Pf+6ujCfW9b5v/XuKquT7XFbSGKEQLvDafZQ/U/tVKYMpjM40aPXK/rBHyv61531kuWmg7qYelntCGhe5dDaH8PEYddbkSsrjAuxUEBZIZtw= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611247780742.5421061841887; Thu, 18 Apr 2019 11:14:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:45213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBXm-0003nd-Ka for importer@patchew.org; Thu, 18 Apr 2019 14:13:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBMr-0003La-K5 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBMq-00025u-E1 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56910) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMi-0001ya-JU; Thu, 18 Apr 2019 14:02:30 -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 B38C6307B965; Thu, 18 Apr 2019 18:02:26 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDB4F1001E98; Thu, 18 Apr 2019 18:02:21 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:37 +0200 Message-Id: <20190418180057.3593-10-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.47]); Thu, 18 Apr 2019 18:02: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] [PATCH for-QEMU-4.1 v5 09/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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-softmmu.= 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 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555610835; cv=none; d=zoho.com; s=zohoarc; b=PKqf6sfSLAwWuuPgg1tb8CKEj+F4mhnXGFzuzPwTlTMPtn3z63PabAnrGCx1EK5OyR6tzeXslZyUfWhy0TYgwli6ErdE5hvIy25g/GxzbVTT7Dy493/BW4Z2weNBPsvz3fxQHWyFVwtP87vVM4rsw1vTqoUsNK5f1UsfqxZxEXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555610835; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=t/dIPvBwM6o3l5waFpY0LsUekYNj0k8XTEaZDmbjTWc=; b=M/SMqTSOO3r3ZwMpZYtQ4bxaWCMAbYWsX3NaVNLCcgRRS72TatgILcnW+87I98nzeNwV8d1PGt1QbdH7ic7Rv1ECyDOZdQx3c88SG+FO3uwfpPqN7YPRTGSrw6TlxBe2lGcPpT55FCO90yOIXSDF6n9V9NmxOrmptX2YEdeeQCM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555610835748943.6467746524078; Thu, 18 Apr 2019 11:07:15 -0700 (PDT) Received: from localhost ([127.0.0.1]:45100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBR8-0006Pi-O7 for importer@patchew.org; Thu, 18 Apr 2019 14:07:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBN9-0003YG-A1 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBN7-0002Dr-2Y for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:02:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59802) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBMv-00028H-Ev; Thu, 18 Apr 2019 14:02:42 -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 314E970D6D; Thu, 18 Apr 2019 18:02:40 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A75F1001F41; Thu, 18 Apr 2019 18:02:26 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:38 +0200 Message-Id: <20190418180057.3593-11-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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]); Thu, 18 Apr 2019 18:02: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 for-QEMU-4.1 v5 10/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 b7ed3c530b..3f82d635e4 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_MUSCA=3Dy CONFIG_CHEETAH=3Dy CONFIG_SX1=3Dy CONFIG_NSERIES=3Dy +CONFIG_STELLARIS=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -24,16 +25,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 71126254ff..b91503f5a6 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -91,6 +91,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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611430; cv=none; d=zoho.com; s=zohoarc; b=KznbH9VkLSusP3tF3pAGKgrEfFBKD+0d9eCkogJTaLtHPoQxfZjKKVwGtKLT2B6+6k7LqPFPUccgk+p6/miXJH5wxp8M0HTO+zpGVBxZgoHd0nqj5KrYe4xDMp52qjVfV7lERTfCR8Qp3UfDJqXeNNNzzHeraKadUidj4+XQXcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611430; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BcOnKinFWCPxhD05Wt2TBd+oiVWfnT1AlSTUnt3jrkM=; b=RlxY5XwjpKadpnxHPgiZQ/t+vZgNi/VOvMLU/3Vb6BPREBOr1j+KPyV90r87zy/zKyJb2foDPu0v1x0XM08G5bvkNHW7S5fkBr1WrXeCItWGPJghvIYbigxumNrJy29WaIETfWdeRK6rrwpKvhfaCit7MNZs+4A9ed9590OYj9c= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155561143003317.095799082905046; Thu, 18 Apr 2019 11:17:10 -0700 (PDT) Received: from localhost ([127.0.0.1]:45283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBas-0006YS-Tt for importer@patchew.org; Thu, 18 Apr 2019 14:17:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNR-0003oo-V9 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBNQ-0002Pm-4e for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50051) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBN9-0002BL-FN; Thu, 18 Apr 2019 14:02:57 -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 DDEC530254A3; Thu, 18 Apr 2019 18:02:47 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79D131001E98; Thu, 18 Apr 2019 18:02:40 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:39 +0200 Message-Id: <20190418180057.3593-12-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.43]); Thu, 18 Apr 2019 18:02:48 +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 for-QEMU-4.1 v5 11/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 24 ++++------------- hw/arm/Kconfig | 48 +++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- hw/display/Kconfig | 1 + hw/i2c/Kconfig | 2 +- 5 files changed, 57 insertions(+), 21 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3f82d635e4..df7d9421e0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,9 +3,8 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=3Dy =20 -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_PCI_TESTDEV=3Dy +# CONFIG_PCI_DEVICES=3Dn +# CONFIG_TEST_DEVICES=3Dn =20 CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy @@ -17,6 +16,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 @@ -25,8 +27,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 @@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 -CONFIG_ARM11MPCORE=3Dy - CONFIG_NETDUINO2=3Dy =20 -CONFIG_PL041=3Dy -CONFIG_PL080=3Dy -CONFIG_PL190=3Dy CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy CONFIG_PXA2XX=3Dy @@ -52,12 +47,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 @@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy CONFIG_ARMSSE_MHU=3Dy =20 -CONFIG_VERSATILE=3Dy -CONFIG_VERSATILE_PCI=3Dy -CONFIG_VERSATILE_I2C=3Dy - CONFIG_PCI_EXPRESS=3Dy CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy =20 @@ -120,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 b91503f5a6..b786cfc5bd 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -88,6 +88,30 @@ config PXA2XX =20 config REALVIEW bool + imply PCI_DEVICES + imply PCI_TESTDEV + 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 @@ -111,6 +135,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 @@ -183,6 +230,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 8302b8df1d..bd0b45a799 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 a11815c9af..0577e68c8e 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 820b24de5b..aee961541c 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555610888; cv=none; d=zoho.com; s=zohoarc; b=fUi0OI/pnw8dWjC2loCXurZF3Q8waSiW7Dz6GfFLZLB7X7PLhKWU3YNPGvtvSXh/Q3YwYZOPJrlr6s+yZrJu5GrV1odswPhoCCXgwcwi+85WAXnbGExglLi7ZM0Q8QjGpn0V4WxMv5BUMc6vjeBgrAfGQKSNzR7yn9vkXKAaS0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555610888; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jPUWy0+kV+Y7MlWFYvGt5tFdqzkL8Behm4Px+f3qi3A=; b=XgfFp4gfLocUpzlshsOGZ4u+eD574u6+opsxHIosQEDTZYLZSZML/WVh4LTFCSf4JdZIv+ok3gY2D6BprlqJNAKQ06IgEWfvD1gNTxxXwsarSiKG/odImV0sPYXQ8H8RN4+qByfme3GGubWMyab220hDuJerdeJJ6cg3PcYdb8U= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555610888615578.876353493527; Thu, 18 Apr 2019 11:08:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:45104 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBS9-0007G1-Hk for importer@patchew.org; Thu, 18 Apr 2019 14:08:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNT-0003q2-3Y for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBNR-0002Qg-Te for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35508) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBNI-0002Il-Bv; Thu, 18 Apr 2019 14:03:04 -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 6B8483078DDD; Thu, 18 Apr 2019 18:03:01 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33FCF1001DC8; Thu, 18 Apr 2019 18:02:48 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:40 +0200 Message-Id: <20190418180057.3593-13-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.43]); Thu, 18 Apr 2019 18:03:01 +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 for-QEMU-4.1 v5 12/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 15 ++++-------- hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 5 +++- 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index df7d9421e0..f39a854f2e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -19,22 +19,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 @@ -42,16 +40,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 b786cfc5bd..101de74260 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -48,6 +48,9 @@ config INTEGRATOR =20 config MAINSTONE bool + select PXA2XX + select PFLASH_CFI01 + select SMC91C111 =20 config MUSICPAL bool @@ -85,6 +88,43 @@ config OMAP =20 config PXA2XX bool + select FRAMEBUFFER + select I2C + 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 @@ -217,6 +257,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 bd0b45a799..00328d1b0b 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611631; cv=none; d=zoho.com; s=zohoarc; b=SeXNLwT7rE3nKYYX/isH2V2KzOFPdcuvkd1CHgyHulGiQakFQ3URmdAW7ODViochS1Y2G5SQMjb9xtMng3/C4ws3PAmhBUSaSnAWlzs/G8u5YQwVZLTqn22n5UfNHMPxnVRKBGxSKdMrNPc0RO/XeZLrJidqUxN2C+ache5gatc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611631; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=J4oacEZ/jF7uRyaYOyyGSuwNfD2oycHQb0fLv7OPb3Q=; b=QTJAqjnJSeN5LKeoa05UZLLhrd/8I863TfhmjEbf3bMO5Ms3oZkzkyMZYu0IzU1DLVqkmWWnLIm42SDohACC0kgiAgpDqxR+Ou+3qFkuj7wBSxqXH03zoVmE4wsb1hP+DpZBcVffJ9ssaSY/j0rMuOGYtbyjZSpf+Pq6lH2VmcU= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611631129762.6850153176732; Thu, 18 Apr 2019 11:20:31 -0700 (PDT) Received: from localhost ([127.0.0.1]:45323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBe7-0000kf-4y for importer@patchew.org; Thu, 18 Apr 2019 14:20:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNV-0003ry-4l for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBNT-0002Rv-UL for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBNN-0002Nj-AY; Thu, 18 Apr 2019 14:03:09 -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 8D240319939D; Thu, 18 Apr 2019 18:03:07 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id B54881001DC8; Thu, 18 Apr 2019 18:03:01 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:41 +0200 Message-Id: <20190418180057.3593-14-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.41]); Thu, 18 Apr 2019 18:03: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 for-QEMU-4.1 v5 13/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index f39a854f2e..af78e7c892 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -19,6 +19,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 @@ -38,16 +39,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 @@ -100,7 +96,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 101de74260..785e383411 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -201,6 +201,18 @@ config VEXPRESS =20 config ZYNQ bool + select A9MPCORE + select CADENCE # UART + select PFLASH_CFI02 + select PL330 + select SDHCI + select SSI_M25P80 + 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555612160; cv=none; d=zoho.com; s=zohoarc; b=CHnixafSrsU3Err/L0LC5bYCTT7a5oUEuPK4a/FqVkS5xbvEvsv8WpDZvccY9qKO7twA1Uw3ES4ZvxYs0synI/MfowO21Ahu8q8GzYffDLb+fbqCNc5n8abKTYiMsydQ0MaVClWOe9SsFbOrpRXv8X+0ELfPrwTG4wXWoERxCrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555612160; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=V7JCGi3M/md4LpxmGIgiZr4j+ajfMN5fiOpKaWrE3SM=; b=IsTc2G7ynryrrKNgDPH66bPKKsxcd8azOb9Juz7ktwJNrD00rUV866aSlc4cD4x6nZNzdR9S7siYqk9BKRTGd6D0q7iqiEKhvJr15eLnbYAqW6VHU5V2Cgj59kHbDkXIM3m+4aKYVMKP/JCy3OsDh5SfU+QxhI1tDczopHfi4C8= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555612160111871.6366092512569; Thu, 18 Apr 2019 11:29:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:45531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBmb-0008Oz-W2 for importer@patchew.org; Thu, 18 Apr 2019 14:29:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBST-00081E-Eb for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:08:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBSS-0005nc-Gh for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:08:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41918) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBNT-0002Rk-R4; Thu, 18 Apr 2019 14:03: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 C1ECE6696F; Thu, 18 Apr 2019 18:03:14 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id D55321001F41; Thu, 18 Apr 2019 18:03:07 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:42 +0200 Message-Id: <20190418180057.3593-15-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.38]); Thu, 18 Apr 2019 18:03:15 +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 for-QEMU-4.1 v5 14/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 af78e7c892..25e8f717ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -97,5 +98,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 785e383411..325133c129 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -168,6 +168,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 00328d1b0b..729e711b87 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611025; cv=none; d=zoho.com; s=zohoarc; b=mVB8VopfDfeMtCEiFy/PS5jI3RrgRBGXw+vv5H9K9ySuCQfj0bru//ZNOiAARLLZF+0kiZwLsRnXQacZkTQ/Vk5AqKaQZYMPb3PnqJMJJwzLyyG1clCVEvAj0M6xeMKiwjlMe7DU3V96yPztvVqrmeGqtIiuPj+Ldj7OpLBBGhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611025; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BjmJD4ACuB9XueK8yZAwmmGj9bet2jRtiZ1wGp3NGj8=; b=dvd/MzG89O5qPBCtLFfzxJmQjqgspo4EjhXe6PnOi3mwMhyvf3vM+sVt2IbOVntJsdIJtFSScZPP5m/jzWOwkaUn9WvJGa52Cteh9JkL98HRTPlX1mpb/FCKNbWphs27bsWtdD02yjTZQhUZmUjhoRwaRo4q7264JTO82HbX28Y= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611025004886.5980153386016; Thu, 18 Apr 2019 11:10:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:45153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBUF-0000bg-Eq for importer@patchew.org; Thu, 18 Apr 2019 14:10:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNn-00047B-Es for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBNm-0002ac-CP for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40210) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBNd-0002VW-Dx; Thu, 18 Apr 2019 14:03:25 -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 3C6D630A7C97; Thu, 18 Apr 2019 18:03:24 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1541E1001DEF; Thu, 18 Apr 2019 18:03:14 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:43 +0200 Message-Id: <20190418180057.3593-16-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.40]); Thu, 18 Apr 2019 18:03:24 +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 for-QEMU-4.1 v5 15/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Dependencies have been determined by looking at hw/arm/aspeed.c Signed-off-by: Thomas Huth Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 25e8f717ac..2580584281 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -26,15 +26,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 @@ -92,8 +89,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 325133c129..abeaa54d88 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -254,6 +254,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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611847; cv=none; d=zoho.com; s=zohoarc; b=lcnD23gwxQ5xf0pMckbF1QPOVWD+LTBJL+VgIkwK31LAYTdS0HArPoschSZQl3b/K8J1EMaCdeMiq2WzVPH4W1dvdCbpBag0SHKr09yM8TfI7deJMSwLulN2HE6fueU36rR65GuzceP49fmY2ldLT5NBYu4MEavpLTOiwGIjwdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611847; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JbImIg2jCRtfLPLcdIgCyfVLBq132vRWcNPImiietb4=; b=jBOlmH4cykrvrcxlC53MUAebXnE0DckcV06pipa7ZkLc+dDUSiNWX3xQYSUUbo+S//8LHtZiAQyom65SsIrY8Z4FNghe5O9fTwBQnAkbemQh4oHId4vYL225yFthVgWJ8fV6CyXo7kZCofRJM/SGD1UI9QDa1d36AYz+xOQsCKg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611847583275.78737027743205; Thu, 18 Apr 2019 11:24:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:45424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBhb-0003sw-94 for importer@patchew.org; Thu, 18 Apr 2019 14:24:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBNt-0004Di-SO for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBNs-0002cf-Qj for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:03:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBNk-0002ZB-BQ; Thu, 18 Apr 2019 14:03:33 -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 7DCB9300414E; Thu, 18 Apr 2019 18:03:30 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 867561001DEF; Thu, 18 Apr 2019 18:03:24 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:44 +0200 Message-Id: <20190418180057.3593-17-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.46]); Thu, 18 Apr 2019 18:03: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-devel] [PATCH for-QEMU-4.1 v5 16/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Dependencies have been determined by looking at hw/arm/virt.c Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 2580584281..f440a2b1cd 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=3Dy # CONFIG_PCI_DEVICES=3Dn # CONFIG_TEST_DEVICES=3Dn =20 +CONFIG_ARM_VIRT=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -32,8 +33,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 @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy CONFIG_ARMSSE_MHU=3Dy =20 -CONFIG_PCI_EXPRESS=3Dy -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=3Dy - CONFIG_ALLWINNER_A10_PIT=3Dy CONFIG_ALLWINNER_A10_PIC=3Dy CONFIG_ALLWINNER_A10=3Dy @@ -86,10 +82,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 abeaa54d88..4d0febf644 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,6 +1,24 @@ config ARM_VIRT bool + imply PCI_DEVICES + imply TEST_DEVICES + imply VFIO_AMD_XGBE imply VFIO_PLATFORM + 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 =20 config CHEETAH bool @@ -298,6 +316,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 729e711b87..4f591ca487 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611206; cv=none; d=zoho.com; s=zohoarc; b=iNvX+olbpY4is8gdRr07SGB28k0Jk99j8pmDJ5qCq3jm9VfdeZcZ/DUJB9LjQcYyUaHV+T0LC3PA9kdefbHV++6KWE9pK2VvKvvzZ0jpz33jvwOUQyZlwKNWCqNU42nAttAuDYxrRuV6jLH3ZQ3V/fI5ag+d0trK/a2RH6URaCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611206; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=vbecLoR04RLyl2lFC3x0ylwDoxmDr6LMDVdMeHxpjTY=; b=bGO+Bt4h3paE2u42C+IL4Vk3PwGIimVJ8Yi1jda9YCZQoiNpTiALR5fen4CFNlN58EeDJ818Yj9qkgjiW+IhIkMl79t7Pn9A9EdhwkTytP7PdwQJZ+7jopfA5gIkGo3FbozBlAlf+Q9WGAbOuBdKCA7gzPkXXTqU3cKmbgZx72k= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611206911825.9568213680799; Thu, 18 Apr 2019 11:13:26 -0700 (PDT) Received: from localhost ([127.0.0.1]:45209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBXF-0003KY-DG for importer@patchew.org; Thu, 18 Apr 2019 14:13:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOO-0004cH-7H for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBOK-0002pq-DY for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBNx-0002eB-Gf; Thu, 18 Apr 2019 14:03:46 -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 443D2307CB3B; Thu, 18 Apr 2019 18:03:44 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6D851001E66; Thu, 18 Apr 2019 18:03:30 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:45 +0200 Message-Id: <20190418180057.3593-18-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.42]); Thu, 18 Apr 2019 18:03:44 +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 for-QEMU-4.1 v5 17/29] 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: "Michael S. Tsirkin" , Alistair Francis , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Netduino only depends on the stm32f205 SoC which in turn depends on its components. Reviewed-by: Alistair Francis Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 f440a2b1cd..c86a9f5427 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -28,25 +28,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 4d0febf644..49306d6419 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 @@ -250,6 +251,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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611877; cv=none; d=zoho.com; s=zohoarc; b=Z1Gh/YCgB0S0oNLuf3UvkRgdp4gLrpc+Q+HP6u+9fcpJ5U5qo/hAR8mR2gFXSSnWh57WsGlbV/M75O1XX5sgGU5xMsrZ+JiFNcA/yRis03sM/2bgh4yi5Xb2cN7WqIzjIIt6QK5a/G8Ve/KQT8Op+03tfiqhE2S0xgDR6UkkIYk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611877; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=5IyWgTw1JPnU7rkPneAC55smRyYRpNzwEJUpmgNPUY0=; b=KQbkiARm3V5J/l8o0MsYEgRoKLSFmws10BuKwsu4Uq1K4/F1Lx7fp0dd2GnMmttNlqJUyGX5EVsSd3+AAT8RBT2at94UD8AK0GyocPdcfWThcR3WFhObZFzVFHBkrbWFn92QaS0VjAg6v3O+R+aOlzhLj27P19n6CDtOfA5R5go= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611877083598.5803354317085; Thu, 18 Apr 2019 11:24:37 -0700 (PDT) Received: from localhost ([127.0.0.1]:45426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBi5-0004Ho-1w for importer@patchew.org; Thu, 18 Apr 2019 14:24:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOQ-0004f5-Vo for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBON-0002s3-3T for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBO3-0002gF-KM; Thu, 18 Apr 2019 14:03:52 -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 4AA6E300250C; Thu, 18 Apr 2019 18:03:50 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BA0C1001F52; Thu, 18 Apr 2019 18:03:44 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:46 +0200 Message-Id: <20190418180057.3593-19-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.45]); Thu, 18 Apr 2019 18:03: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 for-QEMU-4.1 v5 18/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add dependencies for the Cubitech Cubieboard. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index c86a9f5427..a0b9016e3a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -7,6 +7,7 @@ CONFIG_ARM_V7M=3Dy # CONFIG_TEST_DEVICES=3Dn =20 CONFIG_ARM_VIRT=3Dy +CONFIG_CUBIEBOARD=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -32,7 +33,6 @@ CONFIG_NETDUINO2=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy =20 CONFIG_FRAMEBUFFER=3Dy @@ -60,10 +60,6 @@ CONFIG_IOTKIT_SYSINFO=3Dy CONFIG_ARMSSE_CPUID=3Dy CONFIG_ARMSSE_MHU=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 49306d6419..2ef5696900 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -25,6 +25,10 @@ config CHEETAH select OMAP select TSC210X =20 +config CUBIEBOARD + bool + select ALLWINNER_A10 + config DIGIC bool select PTIMER @@ -245,6 +249,11 @@ config ARM_V7M =20 config ALLWINNER_A10 bool + select AHCI + select ALLWINNER_A10_PIT + select ALLWINNER_A10_PIC + select ALLWINNER_EMAC + select SERIAL =20 config RASPI bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611432; cv=none; d=zoho.com; s=zohoarc; b=Le8LxQosZoPjE7iWf4TSd/ih30vHcHoRw43rynIEL0WRVSucqvxyXW1UtgmqniUTCqpa8kwRlbDfNbpfmGkArQdYUawGZ6cNXjkOjfoA4PZdJacmpEGRcMTGvOxITxGydzXAZud3rdHHmjfEmmcsIZ5YznwKXQUOlLrMNcaI/bQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611432; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SiOm5iHC5BzT9d2KNDehmoBXabjjFzDRQ++hV9uibIs=; b=YWrPwVnz8vvuswX6tWTg7vQaZ+0WWrHWV94H3e1+j4HtUPQ79JFlh2pKAVxjK1HLlxv+kOQSfU4As1kzyfLClGp1zhWLalrDrsF7c5iqt0Sq5nwRcbFrjr8fYoAKbPEW3bH9MULA7I3OOjqYpE66PxfMP1AMJgTSiDl753hISbM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611432193737.9993411339354; Thu, 18 Apr 2019 11:17:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:45281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBat-0006Xy-24 for importer@patchew.org; Thu, 18 Apr 2019 14:17:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOX-0004kV-OI for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBOV-0002xA-9c for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28747) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBOK-0002jV-DL; Thu, 18 Apr 2019 14:04:09 -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 747083D945; Thu, 18 Apr 2019 18:03:59 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CF2110816BC; Thu, 18 Apr 2019 18:03:50 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:47 +0200 Message-Id: <20190418180057.3593-20-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.30]); Thu, 18 Apr 2019 18:03:59 +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 for-QEMU-4.1 v5 19/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 mps2-an* machines. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 20 +------------------- hw/arm/Kconfig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index a0b9016e3a..31d31d3f4a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -30,6 +30,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 @@ -38,28 +39,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_ARMSSE_MHU=3Dy - CONFIG_FSL_IMX6=3Dy CONFIG_FSL_IMX25=3Dy CONFIG_FSL_IMX7=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2ef5696900..466b143fdf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -301,6 +301,12 @@ config ASPEED_SOC =20 config MPS2 bool + select ARMSSE + select LAN9118 + select MPS2_FPGAIO + select MPS2_SCC + select PL022 # Serial port + select PL080 # DMA controller =20 config FSL_IMX7 bool @@ -340,6 +346,18 @@ config ARM11MPCORE =20 config ARMSSE bool + select ARMSSE_CPUID + select ARMSSE_MHU + 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 TZ_MPC + select TZ_MSC + select TZ_PPC =20 config ARMSSE_CPUID bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555612020; cv=none; d=zoho.com; s=zohoarc; b=FDTAvmdGS1s1MM/NPwYCAcJKW64tHwdl39tswW5gPXrps8NQkTRXrGb/40tyqjK5xL1OGffm1M2J3PV0oT2N9smSUgSsJArc50D3hbWbl6cjLabAbB6EzFpiPRRGIbo65BuJ7O55H4VahDV22GXt0ovKrrFjg7mOHQeAIlthClU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555612020; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=5ApIW91UKUxHp67NT7IqFQMuHKfSZXONgRte4mf1X60=; b=cBAp+uvkaROwZ73w1/kk2EJ+f28cHPQgKnHFIj1QtM24vzM2oB10gdyb0WW7bYtHnaG1SvM1NRF/8QpCdVVKNH+LSIaFTXGqtq2tyRfx8svSnVWbS9WpnUw0Tp6ipFTxLlsTrrwEewN8GDPUuF7+deosxqHnC8UG5Vv95zYnvE4= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555612020012526.9923279556757; Thu, 18 Apr 2019 11:27:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:45486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBkP-0006Xb-1R for importer@patchew.org; Thu, 18 Apr 2019 14:26:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOb-0004p6-8j for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBOa-00030u-8Q for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBOQ-0002sa-Qo; Thu, 18 Apr 2019 14:04:14 -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 B7C593D945; Thu, 18 Apr 2019 18:04:11 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD68A1001E66; Thu, 18 Apr 2019 18:03:59 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:48 +0200 Message-Id: <20190418180057.3593-21-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.30]); Thu, 18 Apr 2019 18:04:12 +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 for-QEMU-4.1 v5 20/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 31d31d3f4a..22bff20b32 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -257,6 +257,9 @@ config ALLWINNER_A10 =20 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI =20 config STM32F205_SOC bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611085; cv=none; d=zoho.com; s=zohoarc; b=W4plQPM0ekgZnXQLWMRuYYiVbf4S1D2hZDZ0M/eDmhRHeRsuVNF30fVlf8JDo/f+p+kPrJsA8dUetY05uUvSYgvotEmfuYpfvlA6pfHZ/20hzuzsmDqei674glOi0EjIpDJWcgRXe18KTAETZcfxGdVNWsjNeQ0P5AexQrmUXO0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FbzwRZBQ4TIk+nJ0a4nfJFKYyLrJSxJZ1Tz7T+FlVu8=; b=CQD7g90WFjiRTs0rTwmUGsA1VFfHSKZYz6INnjLwPXRlzJNdM9n8jYw48mxq/ukL2icISEGwdWHiFoIX/oRl8jf6+LwIfoGicAb9WtSVPMYfEPp7BYYqVQUnlSaOH0/QNSZ5JzxFA0v7aMzZSnaBY9PQfZTcnUy4LM4WkmOMU3s= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611085634987.8547618124526; Thu, 18 Apr 2019 11:11:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:45189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBVK-0001dd-H2 for importer@patchew.org; Thu, 18 Apr 2019 14:11:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOn-00050W-Pe for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBOl-0003Aw-NY for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBOe-00032M-15; Thu, 18 Apr 2019 14:04:28 -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 EE62F319936E; Thu, 18 Apr 2019 18:04:26 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09E131001E66; Thu, 18 Apr 2019 18:04:11 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:49 +0200 Message-Id: <20190418180057.3593-22-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.41]); Thu, 18 Apr 2019 18:04:27 +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 for-QEMU-4.1 v5 21/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 22bff20b32..76508e3910 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -32,12 +32,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 e68a29ca2b..059fb8282c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -32,6 +32,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 =20 config EXYNOS4 bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555612006; cv=none; d=zoho.com; s=zohoarc; b=nJHss0k9DqO6o2kMP7KC/mBcrOt/0BiEzVZ8h6RYDDM3ExjbzQbdFfkuuekJ4Kn5+i+y6c7OQzv76JIlNrgzAAp21RLVTpItyV7qOqG2rWD4bi5pmOII0FW7LIxLrM6rTx30MG7tLrozdRbBZu8ByfBOF9WGLCQZKDWtPycj/xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555612006; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=4C2QnbaXhuKOThuwq/ti6p8Cd/433pimSj+ZTwfmj14=; b=na60E5yFsvKPZyUWL/nSUdZJ4i70aPhp/oidFA0/jht1z7u/5QTxr2nxNO3wt8U8YZtJNUMOh2iR0RsU4qxs3I9lklW465IFUIFlfKNOA5gSK2OtF97PkHdzI06Sm0h3heSb+cQgsAGMSvpPsgxEtJYg0zwvbQ6agbZF6aBTHKk= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555612006198840.1398819775866; Thu, 18 Apr 2019 11:26:46 -0700 (PDT) Received: from localhost ([127.0.0.1]:45483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBkA-0006JL-5J for importer@patchew.org; Thu, 18 Apr 2019 14:26:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBOz-0005AB-KU for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBOy-0003Ok-I9 for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:04:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBOp-0003Dp-L5; Thu, 18 Apr 2019 14:04:41 -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 E891A30944B6; Thu, 18 Apr 2019 18:04:36 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42BE51001DC8; Thu, 18 Apr 2019 18:04:27 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:50 +0200 Message-Id: <20190418180057.3593-23-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.40]); Thu, 18 Apr 2019 18:04:37 +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 for-QEMU-4.1 v5 22/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 Sabrelite / iMX6 machine. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 76508e3910..ef7dd7156a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -33,6 +33,7 @@ CONFIG_NETDUINO2=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_DIGIC=3Dy +CONFIG_SABRELITE=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy @@ -40,13 +41,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 059fb8282c..065c7acf1b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -177,6 +177,10 @@ config REALVIEW select DS1338 # I2C RTC+NVRAM select USB_OHCI =20 +config SABRELITE + bool + select FSL_IMX6 + config STELLARIS bool select ARM_V7M @@ -289,6 +293,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 4f591ca487..fadd69882c 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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611250; cv=none; d=zoho.com; s=zohoarc; b=fRMfKrh5ce5dzRq7Xme/1xcU0hzxMj8vlJHaAMPlDVwiBhJET2EW4kiPO0Ne96cz2JolGDS4H5MIKvIadwIk7tr+YNxCoLfZ+GODXIsB+mPip3ogcLbKvd1RlF7yVmIhvpi3Qicbtcx35v6m75BkC4WxGyaR44PFrEHqNvsrhTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611250; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=E+/o2SHUFCpVKPgcTfuaf67oG50VFrE85LsHMQnYsdI=; b=ZJLly7saLX1+7AnQh9QLr+5ekidplK1kXj0A0cLK6q+TUhEbzB6Zt6Ztz7lrndigIbz2AWlbeoxJhiqoOKEYaWHcWnhrTo7zjGT5gZYzuGUuin/0cHl8L3thgXKzb9Akj09OVWfikEsbn1zi5M8AJxXrZNy9uJP95rtwfdx6Bwc= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611250809444.406314018776; Thu, 18 Apr 2019 11:14:10 -0700 (PDT) Received: from localhost ([127.0.0.1]:45215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBXz-00044C-O9 for importer@patchew.org; Thu, 18 Apr 2019 14:14:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBPL-0005R4-SJ for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBPK-0003aZ-Be for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27006) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBPF-0003YJ-1N; Thu, 18 Apr 2019 14:05:05 -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 F31D1308A11B; Thu, 18 Apr 2019 18:04:58 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 403951018A14; Thu, 18 Apr 2019 18:04:37 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:51 +0200 Message-Id: <20190418180057.3593-24-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.44]); Thu, 18 Apr 2019 18:05:04 +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 for-QEMU-4.1 v5 23/29] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 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" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 emcraft-sf2 machine - we also distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 ef7dd7156a..1455d083d8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -34,9 +34,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 @@ -49,5 +49,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 065c7acf1b..f5cd63860d 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -331,9 +331,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 fadd69882c..eae9f6c442 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_MUSCA) +=3D musca.o obj-$(CONFIG_ARMSSE) +=3D armsse.o obj-$(CONFIG_FSL_IMX7) +=3D fsl-imx7.o mcimx7d-sabre.o --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611733; cv=none; d=zoho.com; s=zohoarc; b=WNNblxzJSUsp6vl/ZwSsQM3T/VZtg4s6M2Rj5lLuEoCnAH80/wnRMDp4mDokv2N6YvQd84L6go9hvpzi6jxLfvKsqcrl9S6JLnsycO2vT8zer00SjpcE7PKoXmR88CgR2FdBSgJQImA4FDDpevYYx11NmYYP7SUGVaygUONxmiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611733; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=X8EMr3NjnD5P4KuNHnJE77u+/btAC4dzSb+78piDKqo=; b=JCziKZp8sV51e5pWwHol4N0Pwb/f9dy49uq8l7VuNC7RkfuErP5fJa07PdkjtchY55ZK2Rg5tdFg82m3BF/tdTg+gdggkrJPk/Il0KY+5/yUPZdTnqz85eR5eB2mgfaFJvJIZZ4Ky08K1tbjl4hJWW2nKa5IuE1jDhdk0WYFuus= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611733141779.4831270662118; Thu, 18 Apr 2019 11:22:13 -0700 (PDT) Received: from localhost ([127.0.0.1]:45389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBfe-0002Cb-NZ for importer@patchew.org; Thu, 18 Apr 2019 14:22:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBPs-0005ru-Gu for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBPp-0003rK-5W for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45974) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBPg-0003eL-H1; Thu, 18 Apr 2019 14:05:32 -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 8B9F3C1306EC; Thu, 18 Apr 2019 18:05:20 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 493741018A10; Thu, 18 Apr 2019 18:04:59 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:52 +0200 Message-Id: <20190418180057.3593-25-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.31]); Thu, 18 Apr 2019 18:05:20 +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 for-QEMU-4.1 v5 24/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 1455d083d8..6dc388c43e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -37,7 +37,6 @@ CONFIG_SABRELITE=3Dy CONFIG_EMCRAFT_SF2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_IMX_FEC=3Dy =20 CONFIG_NRF51_SOC=3Dy =20 @@ -49,4 +48,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 f5cd63860d..58439c492a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -283,6 +283,10 @@ config XLNX_VERSAL =20 config FSL_IMX25 bool + select IMX + select IMX_FEC + select IMX_I2C + select DS1338 =20 config FSL_IMX31 bool @@ -296,6 +300,7 @@ config FSL_IMX6 select A9MPCORE select IMX select IMX_I2C + select SDHCI =20 config ASPEED_SOC bool @@ -321,12 +326,26 @@ config MPS2 =20 config FSL_IMX7 bool + imply PCI_DEVICES + imply TEST_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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611907; cv=none; d=zoho.com; s=zohoarc; b=eDTyu/rRantKoC4QYGTfyK6JYNw1xP+XJVGUaJPqxJjr6LJImAVDWcvRJMUM1dZCGr5H1yaiWhVj/k3Q+wCJE5GWnS86WaY6nbjehSrrzDcJx+rPziMz91ag6o+VY9L4X5EoqrRkEGueyxiJFVG6ZiuBkD8GqpLtk0/ZHRcIvhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611907; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KFoqIwmVBhuoY34UGL85E7zGLWoTaRPNTddU1iM+aZs=; b=RnjT2QgLLVaW2iXPdvJNmqlgWkD5W8lZAPY/ItGgvOrGXuKJBjIQo6LN0JuDbKovLckGeVs6lOazdvdCPq6h/B/3dWmq/lgl35oicrY8zy4rErjWyQ1OkdKQJfVVhaaV7AdmnuFcW/rNcKoTxTbsXoGOGML2Qc6owzKY774regE= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555611907811443.94699177064024; Thu, 18 Apr 2019 11:25:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:45430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBiW-0004hM-QM for importer@patchew.org; Thu, 18 Apr 2019 14:25:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBPt-0005sw-Hd for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBPs-0003sr-HK for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41516) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBPg-0003gO-GQ; Thu, 18 Apr 2019 14:05:32 -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 A0BB5308A121; Thu, 18 Apr 2019 18:05:26 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id E25711001DC8; Thu, 18 Apr 2019 18:05:20 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:53 +0200 Message-Id: <20190418180057.3593-26-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.44]); Thu, 18 Apr 2019 18:05: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] [PATCH for-QEMU-4.1 v5 25/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka 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 NRF51 / microbit machine. Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 6dc388c43e..233937f394 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -35,11 +35,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 58439c492a..708eae19e5 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -347,8 +347,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 eae9f6c442..994e67dd0d 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 @@ -48,4 +49,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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555611466; cv=none; d=zoho.com; s=zohoarc; b=UM/2qET7JJfM7lHTKbvVEhRdf1X2m6mDaMNKFW6srAzIWQa9XdNhTaBzCNyq09h2O7BIrsrimZkB4Yv/gJrg9vISdViL4D2ly3gF847q+IChXPhq54o9BzfFPZg+IR60qYZ/eejSWRsfYFP2+AdjJ3r70DwfNle3sueEWlbK9yw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555611466; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=BpR6IRfTUOhSnbvwDaGSSvmq33RjOeqrMzXMC5CZqiA=; b=d0GXpMVWq2lGUZ4kxzbaHEwEyU2zam3qbczFgplzkQr/1WBOdF7VOX7YiB6vID2r2JO6/5nZnHwa8QzTuxNEs6nh8xIO12OnYcyNilKXN6wD7AA5HCZSPu6SOXZcQl/LJJaEKBmjcfH8C9QTDmGPolOpNM5HKfUuVhF8bM0ezwc= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15556114668051003.2534280667885; Thu, 18 Apr 2019 11:17:46 -0700 (PDT) Received: from localhost ([127.0.0.1]:45285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBbT-00072L-OE for importer@patchew.org; Thu, 18 Apr 2019 14:17:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBPu-0005uX-VN for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBPu-0003td-0A for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBPl-0003pA-Dv; Thu, 18 Apr 2019 14:05:38 -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 CF349C05FF80; Thu, 18 Apr 2019 18:05:35 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA751001E66; Thu, 18 Apr 2019 18:05:26 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:54 +0200 Message-Id: <20190418180057.3593-27-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.31]); Thu, 18 Apr 2019 18:05:36 +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 for-QEMU-4.1 v5 26/29] 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" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This cleans up most settings in default-configs/aarch64-softmmu.mak. Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -108,6 +108,7 @@ config VIRTIO_VGA =20 config DPCD bool + select AUX =20 config ATI_VGA bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555612042; cv=none; d=zoho.com; s=zohoarc; b=KMmT++YxrjKY4NU3EtNHNsbhRNSFnt32fkhKp1eGhkY399nLaksvMEx5bVvyB/fVfd6j/oZTuOr43V8Z/Dn1bmJnmYOFzEVxB74l/iXnLYzdj6bCUU0fubjbNcRHQGX+tkxhCa686bI3DAGMzghFSaOKgTSbScPlFQr33DOfvtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555612042; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=bBgOVDs0BDbiWk0zVSjFDXkh4MUGVmOs+GjzGMh8eiQ=; b=AYkWCAm8zaprA3MJfc3fLEgxKyYxtNEMmPL+SxM8ex4gEFBmY5m4C2i994K2sxfsSDbcElVa07MWcQvENiyw+pg9KWOSKFTmCFnqTBwrGEPD5NKp8zlAj1zTnx6ghSUznr2TxkQ1vM0WWIERpDjJmUmyr+CXO8TDpPFFO882wQ0= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555612042022470.50115382715626; Thu, 18 Apr 2019 11:27:22 -0700 (PDT) Received: from localhost ([127.0.0.1]:45488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBki-0006ny-9G for importer@patchew.org; Thu, 18 Apr 2019 14:27:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBQ1-000613-0z for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBPz-0003wg-Fo for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:05:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36532) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBPt-0003tF-Vg; Thu, 18 Apr 2019 14:05:46 -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 A61EC5859C; Thu, 18 Apr 2019 18:05:44 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2611D1001DC8; Thu, 18 Apr 2019 18:05:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:55 +0200 Message-Id: <20190418180057.3593-28-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.39]); Thu, 18 Apr 2019 18:05:44 +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 for-QEMU-4.1 v5 27/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 32e4cc50e5..22be1e1231 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -291,6 +291,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 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555612171; cv=none; d=zoho.com; s=zohoarc; b=kOU7fE5hGIJH+lkFxeHQXXpiz7ezQSc38TkMg/E7w7+omevHX78lirBRbvAKJsVfSK8ZoZ9yBLIqBaFyME/jWx7uDHIiI9qPVFVEjEfGe3RWwxvwg/JqHuW6c9o/pU2ev1eR2V9cn3ehcylDBkoiKFy9z94jXC3xRI1PylqWo70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555612171; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=DH0JJfu5f9UMSb/o24tK9p6TsbeCsvH37ltqZIwNfD8=; b=MM9K6Mm6PsRCqttoqULcy59BkrZmlH2abjxmGhI5MwrzzU3MbCYod12T+bXKqXAoKfBPSph8GAsVVEPU2uJtPOhVDnq6jjwoUn9NJgcqSjf8k1aOcG0c3qx+/jFkDoAytEBJj1uoYuDHTKTsKasaqwRgoRhX2UGc+cBLDCy9Ysk= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555612171811816.0457410962769; Thu, 18 Apr 2019 11:29:31 -0700 (PDT) Received: from localhost ([127.0.0.1]:45533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBmq-000086-Um for importer@patchew.org; Thu, 18 Apr 2019 14:29:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBQI-0006Av-Vk for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:06:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBQF-000449-4P for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:06:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12915) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBQ3-0003ya-4L; Thu, 18 Apr 2019 14:05:55 -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 08AAB3078DB7; Thu, 18 Apr 2019 18:05:54 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBEFC1001DC8; Thu, 18 Apr 2019 18:05:44 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:56 +0200 Message-Id: <20190418180057.3593-29-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.43]); Thu, 18 Apr 2019 18:05:54 +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 for-QEMU-4.1 v5 28/29] hw/arm: Express dependencies of the musca 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Dependencies have been determined with trial-and-error and by looking at the musca.c source file. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/Kconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 22be1e1231..eca8387050 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -75,6 +75,12 @@ config MAINSTONE select PFLASH_CFI01 select SMC91C111 =20 +config MUSCA + bool + select ARMSSE + select PL011 + select PL031 + config MUSICPAL bool select BITBANG_I2C @@ -423,6 +429,3 @@ config ARMSSE_CPUID =20 config ARMSSE_MHU bool - -config MUSCA - bool --=20 2.21.0 From nobody Wed May 1 17:41:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1555612276; cv=none; d=zoho.com; s=zohoarc; b=oCnRtD1qKb2NkRpE/XTH8YAGV3ps0CV0uma5/bN6eYMG0Xhs9uYY6l2vyZCwDKvfcbjJW2cNMORDpLYi9dB20ZBeWC/uLQCuVQ6TX2g6ZI9elvLsceuEoGrjQ4sFSBV7yXjRh0qHZEAeM2tyvLpUVwdNndUfO1n1mDRWnLhFLmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555612276; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=p6A056RmxyCUpVTy298YFHn3D/E04V2BiINMprErA3I=; b=E2oFWzLZWf/eveGnQSNQFvv+0WllEh3kxYjhqQ4zT93b6lDaCsdnmTj+x7r2Dy6EC27ldy1tu3i1RFULfAUhrou+1B9NOmbn6dj+xCTHuDQ3iaFMOG47p0beYSBdFIx5GaL+64tqeteBiBsaLwrIg0NsyznPAkGh71m8Ei1Tn8U= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555612276314885.5164197312073; Thu, 18 Apr 2019 11:31:16 -0700 (PDT) Received: from localhost ([127.0.0.1]:45582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBoU-0001V5-6g for importer@patchew.org; Thu, 18 Apr 2019 14:31:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHBQb-0006VP-It for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:06:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHBQX-0004Ii-PE for qemu-devel@nongnu.org; Thu, 18 Apr 2019 14:06:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36632) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHBQ8-00040n-Ct; Thu, 18 Apr 2019 14:06:00 -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 0AE5364368; Thu, 18 Apr 2019 18:05:59 +0000 (UTC) Received: from thuth.com (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5195B1001E9E; Thu, 18 Apr 2019 18:05:54 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Thu, 18 Apr 2019 20:00:57 +0200 Message-Id: <20190418180057.3593-30-thuth@redhat.com> In-Reply-To: <20190418180057.3593-1-thuth@redhat.com> References: <20190418180057.3593-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.39]); Thu, 18 Apr 2019 18:05:59 +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 for-QEMU-4.1 v5 29/29] 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: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Jean-Christophe Dubois , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Joel Stanley , Antony Pavlov , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Peter Chubb , Cedric Le Goater , John Snow , Andrew Jeffery , Philippe Mathieu-Daude , Subbaraya Sundeep , Igor Mitsyanko , Jan Kiszka Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" 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 Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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 233937f394..f23ecfd5c5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -36,14 +36,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 2.21.0