From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968507623622.5568808539443; Thu, 7 Mar 2019 06:21:47 -0800 (PST) Received: from localhost ([127.0.0.1]:52578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tu3-0005xx-E3 for importer@patchew.org; Thu, 07 Mar 2019 09:21:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tro-0004NQ-Nr for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1trm-00084S-SU for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1trb-0007xs-FH; Thu, 07 Mar 2019 09:19:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5FDF3089E61; Thu, 7 Mar 2019 14:19:10 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id A17A65C1B5; Thu, 7 Mar 2019 14:19:08 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:26 +0100 Message-Id: <1551968334-18982-2-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 07 Mar 2019 14:19:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- 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 b941a0e..c04a5df 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968617150148.4396228510675; Thu, 7 Mar 2019 06:23:37 -0800 (PST) Received: from localhost ([127.0.0.1]:52599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tvh-0007Xd-Pg for importer@patchew.org; Thu, 07 Mar 2019 09:23:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1trl-0004KF-AU for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1trk-00083M-Fe for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48026) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tri-00082C-Pt; Thu, 07 Mar 2019 09:19:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1305681F18; Thu, 7 Mar 2019 14:19:18 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D1A45C1B5; Thu, 7 Mar 2019 14:19:10 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:27 +0100 Message-Id: <1551968334-18982-3-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Mar 2019 14:19:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- 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 ab47b6a..5d9106b 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -44,9 +44,13 @@ config MICRODRIVE =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 a142add..faf04e0 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968926335535.6907096215008; Thu, 7 Mar 2019 06:28:46 -0800 (PST) Received: from localhost ([127.0.0.1]:52704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u0o-00046g-5L for importer@patchew.org; Thu, 07 Mar 2019 09:28:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ts1-0004aI-Kb for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1trz-0008Ej-Vr for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55242) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tru-00089B-FH; Thu, 07 Mar 2019 09:19:31 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3155800AD; Thu, 7 Mar 2019 14:19:28 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 782EA5C1B5; Thu, 7 Mar 2019 14:19:18 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:28 +0100 Message-Id: <1551968334-18982-4-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 07 Mar 2019 14:19:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 03/29] hw/sd/sdhci: 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some machines have an SDHCI device, but no PCI. To be able to compile hw/sd/sdhci.c without CONFIG_PCI, we must not call functions like pci_get_address_space() and pci_allocate_irq() there. Thus move the PCI-related code into a separate file. This is required for the new Kconfig-like build system, e.g. it is needed if a user wants to compile a QEMU binary with just one machine that has SDHCI, but no PCI, like the ARM "raspi" machines for example. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/Kconfig | 6 +++- hw/sd/Makefile.objs | 1 + hw/sd/sdhci-internal.h | 34 ++++++++++++++++++ hw/sd/sdhci-pci.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ hw/sd/sdhci.c | 98 +++-------------------------------------------= ---- 5 files changed, 132 insertions(+), 94 deletions(-) create mode 100644 hw/sd/sdhci-pci.c diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig index 864f535..c5e1e55 100644 --- a/hw/sd/Kconfig +++ b/hw/sd/Kconfig @@ -12,6 +12,10 @@ config SD =20 config SDHCI bool + select SD + +config SDHCI_PCI + bool default y if PCI_DEVICES depends on PCI - select SD + select SDHCI diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs index a99d9fb..0665727 100644 --- a/hw/sd/Makefile.objs +++ b/hw/sd/Makefile.objs @@ -2,6 +2,7 @@ common-obj-$(CONFIG_PL181) +=3D pl181.o common-obj-$(CONFIG_SSI_SD) +=3D ssi-sd.o common-obj-$(CONFIG_SD) +=3D sd.o core.o sdmmc-internal.o common-obj-$(CONFIG_SDHCI) +=3D sdhci.o +common-obj-$(CONFIG_SDHCI_PCI) +=3D sdhci-pci.o =20 obj-$(CONFIG_MILKYMIST) +=3D milkymist-memcard.o obj-$(CONFIG_OMAP) +=3D omap_mmc.o diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 19665fd..3414140 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -304,4 +304,38 @@ extern const VMStateDescription sdhci_vmstate; =20 #define ESDHC_PRNSTS_SDSTB (1 << 3) =20 +/* + * Default SD/MMC host controller features information, which will be + * presented in CAPABILITIES register of generic SD host controller at res= et. + * + * support: + * - 3.3v and 1.8v voltages + * - SDMA/ADMA1/ADMA2 + * - high-speed + * max host controller R/W buffers size: 512B + * max clock frequency for SDclock: 52 MHz + * timeout clock frequency: 52 MHz + * + * does not support: + * - 3.0v voltage + * - 64-bit system bus + * - suspend/resume + */ +#define SDHC_CAPAB_REG_DEFAULT 0x057834b4 + +#define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ + DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ + DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ + \ + /* Capabilities registers provide information on supported + * features of this specific host controller implementation */ \ + DEFINE_PROP_UINT64("capareg", _state, capareg, SDHC_CAPAB_REG_DEFAULT)= , \ + DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0) + +void sdhci_initfn(SDHCIState *s); +void sdhci_uninitfn(SDHCIState *s); +void sdhci_common_realize(SDHCIState *s, Error **errp); +void sdhci_common_unrealize(SDHCIState *s, Error **errp); +void sdhci_common_class_init(ObjectClass *klass, void *data); + #endif diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c new file mode 100644 index 0000000..f884661 --- /dev/null +++ b/hw/sd/sdhci-pci.c @@ -0,0 +1,87 @@ +/* + * SDHCI device on PCI + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see . + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/hw.h" +#include "hw/sd/sdhci.h" +#include "sdhci-internal.h" + +static Property sdhci_pci_properties[] =3D { + DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState), + DEFINE_PROP_END_OF_LIST(), +}; + +static void sdhci_pci_realize(PCIDevice *dev, Error **errp) +{ + SDHCIState *s =3D PCI_SDHCI(dev); + Error *local_err =3D NULL; + + sdhci_initfn(s); + sdhci_common_realize(s, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + dev->config[PCI_CLASS_PROG] =3D 0x01; /* Standard Host supported DMA */ + dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ + s->irq =3D pci_allocate_irq(dev); + s->dma_as =3D pci_get_address_space(dev); + pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->iomem); +} + +static void sdhci_pci_exit(PCIDevice *dev) +{ + SDHCIState *s =3D PCI_SDHCI(dev); + + sdhci_common_unrealize(s, &error_abort); + sdhci_uninitfn(s); +} + +static void sdhci_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); + + k->realize =3D sdhci_pci_realize; + k->exit =3D sdhci_pci_exit; + k->vendor_id =3D PCI_VENDOR_ID_REDHAT; + k->device_id =3D PCI_DEVICE_ID_REDHAT_SDHCI; + k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; + dc->props =3D sdhci_pci_properties; + + sdhci_common_class_init(klass, data); +} + +static const TypeInfo sdhci_pci_info =3D { + .name =3D TYPE_PCI_SDHCI, + .parent =3D TYPE_PCI_DEVICE, + .instance_size =3D sizeof(SDHCIState), + .class_init =3D sdhci_pci_class_init, + .interfaces =3D (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void sdhci_pci_register_type(void) +{ + type_register_static(&sdhci_pci_info); +} + +type_init(sdhci_pci_register_type) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 83f1574..17ad546 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -40,24 +40,6 @@ =20 #define MASKED_WRITE(reg, mask, val) (reg =3D (reg & (mask)) | (val)) =20 -/* Default SD/MMC host controller features information, which will be - * presented in CAPABILITIES register of generic SD host controller at res= et. - * - * support: - * - 3.3v and 1.8v voltages - * - SDMA/ADMA1/ADMA2 - * - high-speed - * max host controller R/W buffers size: 512B - * max clock frequency for SDclock: 52 MHz - * timeout clock frequency: 52 MHz - * - * does not support: - * - 3.0v voltage - * - 64-bit system bus - * - suspend/resume - */ -#define SDHC_CAPAB_REG_DEFAULT 0x057834b4 - static inline unsigned int sdhci_get_fifolen(SDHCIState *s) { return 1 << (9 + FIELD_EX32(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH)); @@ -1328,16 +1310,7 @@ static void sdhci_init_readonly_registers(SDHCIState= *s, Error **errp) =20 /* --- qdev common --- */ =20 -#define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ - DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ - DEFINE_PROP_UINT8("uhs", _state, uhs_mode, UHS_NOT_SUPPORTED), \ - \ - /* Capabilities registers provide information on supported - * features of this specific host controller implementation */ \ - DEFINE_PROP_UINT64("capareg", _state, capareg, SDHC_CAPAB_REG_DEFAULT)= , \ - DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0) - -static void sdhci_initfn(SDHCIState *s) +void sdhci_initfn(SDHCIState *s) { qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SDHCI_BUS, DEVICE(s), "sd-bus"); @@ -1348,7 +1321,7 @@ static void sdhci_initfn(SDHCIState *s) s->io_ops =3D &sdhci_mmio_ops; } =20 -static void sdhci_uninitfn(SDHCIState *s) +void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); timer_free(s->insert_timer); @@ -1359,7 +1332,7 @@ static void sdhci_uninitfn(SDHCIState *s) s->fifo_buffer =3D NULL; } =20 -static void sdhci_common_realize(SDHCIState *s, Error **errp) +void sdhci_common_realize(SDHCIState *s, Error **errp) { Error *local_err =3D NULL; =20 @@ -1375,7 +1348,7 @@ static void sdhci_common_realize(SDHCIState *s, Error= **errp) SDHC_REGISTERS_MAP_SIZE); } =20 -static void sdhci_common_unrealize(SDHCIState *s, Error **errp) +void sdhci_common_unrealize(SDHCIState *s, Error **errp) { /* This function is expected to be called only once for each class: * - SysBus: via DeviceClass->unrealize(), @@ -1445,7 +1418,7 @@ const VMStateDescription sdhci_vmstate =3D { }, }; =20 -static void sdhci_common_class_init(ObjectClass *klass, void *data) +void sdhci_common_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 @@ -1454,66 +1427,6 @@ static void sdhci_common_class_init(ObjectClass *kla= ss, void *data) dc->reset =3D sdhci_poweron_reset; } =20 -/* --- qdev PCI --- */ - -static Property sdhci_pci_properties[] =3D { - DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState), - DEFINE_PROP_END_OF_LIST(), -}; - -static void sdhci_pci_realize(PCIDevice *dev, Error **errp) -{ - SDHCIState *s =3D PCI_SDHCI(dev); - Error *local_err =3D NULL; - - sdhci_initfn(s); - sdhci_common_realize(s, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - - dev->config[PCI_CLASS_PROG] =3D 0x01; /* Standard Host supported DMA */ - dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ - s->irq =3D pci_allocate_irq(dev); - s->dma_as =3D pci_get_address_space(dev); - pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->iomem); -} - -static void sdhci_pci_exit(PCIDevice *dev) -{ - SDHCIState *s =3D PCI_SDHCI(dev); - - sdhci_common_unrealize(s, &error_abort); - sdhci_uninitfn(s); -} - -static void sdhci_pci_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); - - k->realize =3D sdhci_pci_realize; - k->exit =3D sdhci_pci_exit; - k->vendor_id =3D PCI_VENDOR_ID_REDHAT; - k->device_id =3D PCI_DEVICE_ID_REDHAT_SDHCI; - k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; - dc->props =3D sdhci_pci_properties; - - sdhci_common_class_init(klass, data); -} - -static const TypeInfo sdhci_pci_info =3D { - .name =3D TYPE_PCI_SDHCI, - .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(SDHCIState), - .class_init =3D sdhci_pci_class_init, - .interfaces =3D (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - /* --- qdev SysBus --- */ =20 static Property sdhci_sysbus_properties[] =3D { @@ -1846,7 +1759,6 @@ static const TypeInfo imx_usdhc_info =3D { =20 static void sdhci_register_types(void) { - type_register_static(&sdhci_pci_info); type_register_static(&sdhci_sysbus_info); type_register_static(&sdhci_bus_info); type_register_static(&imx_usdhc_info); --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968774242815.1599069319341; Thu, 7 Mar 2019 06:26:14 -0800 (PST) Received: from localhost ([127.0.0.1]:52670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tyL-0001mw-VF for importer@patchew.org; Thu, 07 Mar 2019 09:26:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ts1-0004aG-J5 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ts0-0008FB-S0 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1trw-0008AR-6n; Thu, 07 Mar 2019 09:19:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E13E3089E68; Thu, 7 Mar 2019 14:19:31 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09BFD5C1B5; Thu, 7 Mar 2019 14:19:28 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:29 +0100 Message-Id: <1551968334-18982-5-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 07 Mar 2019 14:19:31 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 18 ++++++------------ hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 2a7efc1..3475d50 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,7 +1,12 @@ # Default configuration for arm-softmmu =20 -CONFIG_PCI=3Dy +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=3Dy + CONFIG_PCI_DEVICES=3Dy + +CONFIG_EXYNOS4=3Dy + CONFIG_VGA=3Dy CONFIG_NAND=3Dy CONFIG_ECC=3Dy @@ -25,7 +30,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 @@ -35,21 +39,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 @@ -60,11 +58,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 @@ -72,7 +68,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 @@ -122,7 +117,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 d298fbd..74436cc 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -8,7 +8,14 @@ config DIGIC =20 config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PCI + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS =20 config HIGHBANK bool @@ -104,6 +111,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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968826659831.3342031845455; Thu, 7 Mar 2019 06:27:06 -0800 (PST) Received: from localhost ([127.0.0.1]:52684 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tzC-0002bL-G3 for importer@patchew.org; Thu, 07 Mar 2019 09:27:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ts7-0004ed-Mx for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ts7-0008Ir-1G for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60195) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1ts5-0008HD-34; Thu, 07 Mar 2019 09:19:41 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 563BE18DF7B; Thu, 7 Mar 2019 14:19:40 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7935D5C1B5; Thu, 7 Mar 2019 14:19:31 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:30 +0100 Message-Id: <1551968334-18982-6-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 07 Mar 2019 14:19: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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 3475d50..13cfffa 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=3Dy CONFIG_PCI_DEVICES=3Dy =20 CONFIG_EXYNOS4=3Dy +CONFIG_HIGHBANK=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -43,24 +44,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 @@ -148,7 +142,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 74436cc..2747e2b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -19,6 +19,18 @@ config EXYNOS4 =20 config HIGHBANK bool + select A9MPCORE + select A15MPCORE + select AHCI + select ARM_TIMER # sp804 + select ARM_V7M + select PCI + 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969111248809.2222814463454; Thu, 7 Mar 2019 06:31:51 -0800 (PST) Received: from localhost ([127.0.0.1]:52762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u3f-0006nG-W6 for importer@patchew.org; Thu, 07 Mar 2019 09:31:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tsJ-0004oF-Bs for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tsI-0008PS-Md for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:19:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48288) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tsG-0008Ny-Nl; Thu, 07 Mar 2019 09:19:52 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0256D3089E68; Thu, 7 Mar 2019 14:19:52 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADD8B5C1B5; Thu, 7 Mar 2019 14:19:40 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:31 +0100 Message-Id: <1551968334-18982-7-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 07 Mar 2019 14:19:52 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 8 +------- hw/arm/Kconfig | 9 +++++++++ hw/display/Kconfig | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 13cfffa..51032c5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -7,6 +7,7 @@ CONFIG_PCI_DEVICES=3Dy =20 CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy +CONFIG_INTEGRATOR=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -31,7 +32,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 @@ -48,10 +48,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 @@ -111,9 +108,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 2747e2b..a08a863 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -34,6 +34,15 @@ 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 PCI + select SMC91C111 =20 config MAINSTONE bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index a96ea76..364d628 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968714443297.9565786271703; Thu, 7 Mar 2019 06:25:14 -0800 (PST) Received: from localhost ([127.0.0.1]:52625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1txO-0000jm-7V for importer@patchew.org; Thu, 07 Mar 2019 09:25:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tsg-0005Cx-R3 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tsd-0000D2-KG for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53710) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tsM-0008R8-ES; Thu, 07 Mar 2019 09:19:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B574D81226; Thu, 7 Mar 2019 14:19:57 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54AAF5C1B5; Thu, 7 Mar 2019 14:19:52 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:32 +0100 Message-Id: <1551968334-18982-8-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 07 Mar 2019 14:19:57 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 5 +++++ hw/misc/Kconfig | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 51032c5..a2e74cd 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy +CONFIG_FSL_IMX31=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -66,7 +67,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 @@ -113,7 +113,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 a08a863..40c79d2 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -101,6 +101,11 @@ config FSL_IMX25 =20 config FSL_IMX31 bool + select SERIAL + select IMX + select IMX_I2C + select LAN9118 + select PCI =20 config FSL_IMX6 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 2c60be9..4db73ec 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968548223126.89030451149858; Thu, 7 Mar 2019 06:22:28 -0800 (PST) Received: from localhost ([127.0.0.1]:52584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tui-0006aJ-14 for importer@patchew.org; Thu, 07 Mar 2019 09:22:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tsj-0005Fq-TL for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tsi-0000Hp-T2 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tsc-0008TG-1f; Thu, 07 Mar 2019 09:20:15 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA2A881104; Thu, 7 Mar 2019 14:20:01 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DEEE5C1B5; Thu, 7 Mar 2019 14:19:57 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:33 +0100 Message-Id: <1551968334-18982-9-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 07 Mar 2019 14:20: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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index a2e74cd..a058bcb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -9,13 +9,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 @@ -38,7 +38,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 @@ -54,14 +53,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 @@ -135,7 +132,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 40c79d2..08c213d 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -49,7 +49,13 @@ config MAINSTONE =20 config MUSICPAL bool + select BITBANG_I2C + select MARVELL_88W8618 select PTIMER + select PFLASH_CFI02 + select PCI + select SERIAL + select WM8750 =20 config NETDUINO2 bool --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968730441162.67655101477862; Thu, 7 Mar 2019 06:25:30 -0800 (PST) Received: from localhost ([127.0.0.1]:52627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1txe-0000z5-AP for importer@patchew.org; Thu, 07 Mar 2019 09:25:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tsp-0005L6-AG for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tso-0000Lq-GX for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49144) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tsh-0000F9-4C; Thu, 07 Mar 2019 09:20:19 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52A8528207; Thu, 7 Mar 2019 14:20:18 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D9515C1B5; Thu, 7 Mar 2019 14:20:02 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:34 +0100 Message-Id: <1551968334-18982-10-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 07 Mar 2019 14:20:18 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 17 ++++------------- hw/arm/Kconfig | 26 ++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index a058bcb..2c07f5c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -10,16 +10,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 @@ -37,9 +37,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 @@ -59,15 +57,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 08c213d..cfb3ab1 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 @@ -62,9 +67,26 @@ 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 PCI + select SD + select SERIAL =20 config PXA2XX bool @@ -78,6 +100,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 fa57c7c..8302b8d 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968946226257.0288312688408; Thu, 7 Mar 2019 06:29:06 -0800 (PST) Received: from localhost ([127.0.0.1]:52707 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u13-0004Jt-2q for importer@patchew.org; Thu, 07 Mar 2019 09:28:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tsp-0005LR-NN for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tsp-0000MK-3t for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tsm-0000KI-UO; Thu, 07 Mar 2019 09:20:25 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2D78E8764B; Thu, 7 Mar 2019 14:20:24 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABC205C1B5; Thu, 7 Mar 2019 14:20:18 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:35 +0100 Message-Id: <1551968334-18982-11-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Mar 2019 14:20: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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- 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 2c07f5c..46ec4eb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -14,6 +14,7 @@ CONFIG_MUSCA=3Dy CONFIG_CHEETAH=3Dy CONFIG_SX1=3Dy CONFIG_NSERIES=3Dy +CONFIG_STELLARIS=3Dy =20 CONFIG_VGA=3Dy CONFIG_NAND=3Dy @@ -22,16 +23,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 cfb3ab1..cb19fd3 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -96,6 +96,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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969336504936.8070507332209; Thu, 7 Mar 2019 06:35:36 -0800 (PST) Received: from localhost ([127.0.0.1]:52806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u7I-0001Fm-3k for importer@patchew.org; Thu, 07 Mar 2019 09:35:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tt4-0005aK-3X for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tt3-0000V1-3e for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tsz-0000Sl-MH; Thu, 07 Mar 2019 09:20:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB3B4C0587DD; Thu, 7 Mar 2019 14:20:36 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83C505C1B5; Thu, 7 Mar 2019 14:20:24 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:36 +0100 Message-Id: <1551968334-18982-12-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Mar 2019 14:20: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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 21 +++--------------- hw/arm/Kconfig | 47 +++++++++++++++++++++++++++++++++++++= ++++ hw/arm/Makefile.objs | 3 ++- hw/display/Kconfig | 1 + hw/i2c/Kconfig | 2 +- 5 files changed, 54 insertions(+), 20 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 46ec4eb..41df0af 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,8 +3,6 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=3Dy =20 -CONFIG_PCI_DEVICES=3Dy - CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -15,6 +13,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 @@ -23,8 +24,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 @@ -36,13 +35,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 @@ -50,12 +44,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 @@ -84,10 +76,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 @@ -118,6 +106,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 cb19fd3..2a82a4f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -93,6 +93,29 @@ config PXA2XX =20 config REALVIEW bool + imply PCI_DEVICES + 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 @@ -116,6 +139,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 @@ -189,6 +235,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 8302b8d..bd0b45a 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 364d628..25116e6 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 ef1caa6..0004893 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969139379224.7581604957361; Thu, 7 Mar 2019 06:32:19 -0800 (PST) Received: from localhost ([127.0.0.1]:52766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u4F-0007GW-7y for importer@patchew.org; Thu, 07 Mar 2019 09:32:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tt8-0005eT-84 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tt7-0000YL-B7 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49412) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tt5-0000Vx-7N; Thu, 07 Mar 2019 09:20:43 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F35E3099D56; Thu, 7 Mar 2019 14:20:42 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52F685C1B5; Thu, 7 Mar 2019 14:20:37 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:37 +0100 Message-Id: <1551968334-18982-13-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 07 Mar 2019 14:20:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 15 +++++--------- hw/arm/Kconfig | 43 +++++++++++++++++++++++++++++++++++++= ++++ hw/arm/Makefile.objs | 5 ++++- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 41df0af..f3ac12c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,22 +16,20 @@ CONFIG_STELLARIS=3Dy CONFIG_REALVIEW=3Dy CONFIG_VERSATILE=3Dy CONFIG_VEXPRESS=3Dy +CONFIG_MAINSTONE=3Dy +CONFIG_GUMSTIX=3Dy +CONFIG_SPITZ=3Dy +CONFIG_TOSA=3Dy +CONFIG_Z2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_NAND=3Dy -CONFIG_ECC=3Dy -CONFIG_SERIAL=3Dy -CONFIG_MAX7310=3Dy CONFIG_TMP421=3Dy CONFIG_PCA9552=3Dy -CONFIG_ADS7846=3Dy -CONFIG_MAX111X=3Dy CONFIG_SSI_M25P80=3Dy CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy CONFIG_FTGMAC100=3Dy CONFIG_DS1338=3Dy -CONFIG_MICRODRIVE=3Dy CONFIG_PLATFORM_BUS=3Dy CONFIG_VIRTIO_MMIO=3Dy =20 @@ -39,16 +37,13 @@ CONFIG_NETDUINO2=3Dy =20 CONFIG_PL330=3Dy CONFIG_CADENCE=3Dy -CONFIG_PXA2XX=3Dy CONFIG_FRAMEBUFFER=3Dy CONFIG_XILINX_SPIPS=3Dy CONFIG_ZYNQ_DEVCFG=3Dy =20 CONFIG_DIGIC=3Dy -CONFIG_MAINSTONE=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy -CONFIG_ZAURUS=3Dy CONFIG_ZYNQ=3Dy CONFIG_STM32F2XX_TIMER=3Dy CONFIG_STM32F2XX_USART=3Dy diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2a82a4f..1a3ad0f 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -51,6 +51,9 @@ config INTEGRATOR =20 config MAINSTONE bool + select PXA2XX + select PFLASH_CFI01 + select SMC91C111 =20 config MUSICPAL bool @@ -90,6 +93,44 @@ config OMAP =20 config PXA2XX bool + select FRAMEBUFFER + select I2C + select PCI + select SERIAL + select SD + select SSI + select USB_OHCI + +config GUMSTIX + bool + select PFLASH_CFI01 + select SMC91C111 + select PXA2XX + +config TOSA + bool + select ZAURUS # scoop + select MICRODRIVE + select PXA2XX + +config SPITZ + bool + select ADS7846 # display + select MAX111X # A/D converter + select WM8750 # audio codec + select MAX7310 # GPIO expander + select ZAURUS # scoop + select NAND # memory + select ECC # Error-correcting for NAND + select MICRODRIVE + select PXA2XX + +config Z2 + bool + select PFLASH_CFI01 + select WM8750 + select PL011 # UART + select PXA2XX =20 config REALVIEW bool @@ -222,6 +263,8 @@ config MSF2 =20 config ZAURUS bool + select NAND + select ECC =20 config A9MPCORE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index bd0b45a..00328d1 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -11,7 +11,10 @@ obj-$(CONFIG_NETDUINO2) +=3D netduino2.o obj-$(CONFIG_NSERIES) +=3D nseries.o obj-$(CONFIG_SX1) +=3D omap_sx1.o obj-$(CONFIG_CHEETAH) +=3D palm.o -obj-$(CONFIG_PXA2XX) +=3D gumstix.o spitz.o tosa.o z2.o +obj-$(CONFIG_GUMSTIX) +=3D gumstix.o +obj-$(CONFIG_SPITZ) +=3D spitz.o +obj-$(CONFIG_TOSA) +=3D tosa.o +obj-$(CONFIG_Z2) +=3D z2.o obj-$(CONFIG_REALVIEW) +=3D realview.o obj-$(CONFIG_STELLARIS) +=3D stellaris.o obj-$(CONFIG_STRONGARM) +=3D collie.o --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968916589292.0511963743503; Thu, 7 Mar 2019 06:28:36 -0800 (PST) Received: from localhost ([127.0.0.1]:52702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u0c-0003t7-Ah for importer@patchew.org; Thu, 07 Mar 2019 09:28:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ttK-0005pH-Og for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ttK-0000go-0V for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:20:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53106) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1ttI-0000fR-BZ; Thu, 07 Mar 2019 09:20:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 635B9753DA; Thu, 7 Mar 2019 14:20:55 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBB595C641; Thu, 7 Mar 2019 14:20:42 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:38 +0100 Message-Id: <1551968334-18982-14-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 07 Mar 2019 14:20:55 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index f3ac12c..54b1c61 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,6 +16,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 @@ -35,16 +36,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 @@ -97,7 +93,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 1a3ad0f..ef9cc97 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -206,6 +206,20 @@ config VEXPRESS =20 config ZYNQ bool + select A9MPCORE + select CADENCE # UART + select PCI + select PFLASH_CFI02 + select PL330 + select SDHCI + select SSI_M25P80 + select USB_EHCI + 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969166008744.132325909607; Thu, 7 Mar 2019 06:32:46 -0800 (PST) Received: from localhost ([127.0.0.1]:52768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u4h-0007ea-M7 for importer@patchew.org; Thu, 07 Mar 2019 09:32:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ttO-0005qx-NL for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ttN-0000sE-VO for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48636) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1ttK-0000gu-Ja; Thu, 07 Mar 2019 09:20:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9A5B804F2; Thu, 7 Mar 2019 14:20:57 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC96F5C545; Thu, 7 Mar 2019 14:20:55 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:39 +0100 Message-Id: <1551968334-18982-15-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 07 Mar 2019 14:20:57 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- 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 54b1c61..44988f7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -22,6 +22,7 @@ CONFIG_GUMSTIX=3Dy CONFIG_SPITZ=3Dy CONFIG_TOSA=3Dy CONFIG_Z2=3Dy +CONFIG_COLLIE=3Dy =20 CONFIG_VGA=3Dy CONFIG_TMP421=3Dy @@ -94,5 +95,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 ef9cc97..43ef149 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -173,6 +173,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 00328d1..729e711 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551968987460312.87224726649697; Thu, 7 Mar 2019 06:29:47 -0800 (PST) Received: from localhost ([127.0.0.1]:52709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u1k-00052U-9B for importer@patchew.org; Thu, 07 Mar 2019 09:29:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44225) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ttP-0005sW-L5 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ttO-0000vy-SE for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8396) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1ttN-0000kl-1W; Thu, 07 Mar 2019 09:21:01 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C201369CD; Thu, 7 Mar 2019 14:21:00 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 380E05C1B5; Thu, 7 Mar 2019 14:20:58 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:40 +0100 Message-Id: <1551968334-18982-16-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 07 Mar 2019 14:21:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Dependencies have been determined by looking at hw/arm/aspeed.c Signed-off-by: Thomas Huth --- 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 44988f7..81c8156 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -23,15 +23,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 @@ -89,8 +86,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 43ef149..e162049 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -262,6 +262,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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969116345824.1281310306761; Thu, 7 Mar 2019 06:31:56 -0800 (PST) Received: from localhost ([127.0.0.1]:52764 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u3k-0006qd-E3 for importer@patchew.org; Thu, 07 Mar 2019 09:31:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ttg-000688-Fe for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ttf-0001JH-OI for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1ttd-0001Hl-QW; Thu, 07 Mar 2019 09:21:17 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 77AF7307D90E; Thu, 7 Mar 2019 14:21:16 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8FDB5C1B5; Thu, 7 Mar 2019 14:21:00 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:41 +0100 Message-Id: <1551968334-18982-17-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 07 Mar 2019 14:21:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Dependencies have been determined by looking at hw/arm/virt.c Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 18 ++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 81c8156..79996a3 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,6 +3,7 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=3Dy =20 +CONFIG_ARM_VIRT=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -29,8 +30,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 @@ -65,9 +64,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 @@ -83,10 +79,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 e162049..76cf754 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,6 +1,23 @@ config ARM_VIRT bool + imply PCI_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 @@ -306,6 +323,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 729e711..4f591ca 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969392436732.2985227242526; Thu, 7 Mar 2019 06:36:32 -0800 (PST) Received: from localhost ([127.0.0.1]:52844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u8J-00029m-BE for importer@patchew.org; Thu, 07 Mar 2019 09:36:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ttk-0006CB-CI for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ttj-0001Ma-Jx for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54574) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tth-0001JU-R7; Thu, 07 Mar 2019 09:21:21 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CD89C058CB0; Thu, 7 Mar 2019 14:21:20 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id D48BD5C648; Thu, 7 Mar 2019 14:21:16 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:42 +0100 Message-Id: <1551968334-18982-18-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Mar 2019 14:21:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- 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 79996a3..beb94d9 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,25 +25,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 76cf754..68eccbf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -84,6 +84,7 @@ config MUSICPAL =20 config NETDUINO2 bool + select STM32F205_SOC =20 config NSERIES bool @@ -256,6 +257,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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969361801984.7709093586718; Thu, 7 Mar 2019 06:36:01 -0800 (PST) Received: from localhost ([127.0.0.1]:52840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1u7l-0001hn-Ju for importer@patchew.org; Thu, 07 Mar 2019 09:35:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1ttt-0006Ly-Ut for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1ttt-0001Sp-70 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54754) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1ttr-0001RG-AO; Thu, 07 Mar 2019 09:21:31 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DA16C058CBD; Thu, 7 Mar 2019 14:21:30 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60EBD5C28C; Thu, 7 Mar 2019 14:21:20 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:43 +0100 Message-Id: <1551968334-18982-19-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Mar 2019 14:21:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add dependencies for the Cubitech Cubieboard. Signed-off-by: Thomas Huth --- 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 beb94d9..b6f3d60 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -4,6 +4,7 @@ CONFIG_ARM_V7M=3Dy =20 CONFIG_ARM_VIRT=3Dy +CONFIG_CUBIEBOARD=3Dy CONFIG_EXYNOS4=3Dy CONFIG_HIGHBANK=3Dy CONFIG_INTEGRATOR=3Dy @@ -29,7 +30,6 @@ CONFIG_NETDUINO2=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy -CONFIG_ALLWINNER_EMAC=3Dy CONFIG_IMX_FEC=3Dy =20 CONFIG_FRAMEBUFFER=3Dy @@ -57,10 +57,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 68eccbf..743c78b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -24,6 +24,10 @@ config CHEETAH select OMAP select TSC210X =20 +config CUBIEBOARD + bool + select ALLWINNER_A10 + config DIGIC bool select PTIMER @@ -251,6 +255,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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 155196957555348.20940718747727; Thu, 7 Mar 2019 06:39:35 -0800 (PST) Received: from localhost ([127.0.0.1]:52882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uBI-0004T6-BC for importer@patchew.org; Thu, 07 Mar 2019 09:39:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tu7-0006Y1-Ut for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tu7-0001cC-4Z for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:21:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55518) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tu0-0001Y2-GH; Thu, 07 Mar 2019 09:21:40 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B54713B7F; Thu, 7 Mar 2019 14:21:39 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id F354C5C28C; Thu, 7 Mar 2019 14:21:30 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:44 +0100 Message-Id: <1551968334-18982-20-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 07 Mar 2019 14:21:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the mps2-an* machines. Signed-off-by: Thomas Huth --- 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 b6f3d60..b8509fd 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -27,6 +27,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 @@ -35,28 +36,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 743c78b..32c8663 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -308,6 +308,13 @@ 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 + select TZ_MPC =20 config FSL_IMX7 bool @@ -347,6 +354,17 @@ 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_MSC + select TZ_PPC =20 config ARMSSE_CPUID bool --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969581925307.4056606425854; Thu, 7 Mar 2019 06:39:41 -0800 (PST) Received: from localhost ([127.0.0.1]:52884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uBO-0004XF-Md for importer@patchew.org; Thu, 07 Mar 2019 09:39:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tuX-0006wp-4J for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tuW-00022y-B3 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45910) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tuB-0001eO-7S; Thu, 07 Mar 2019 09:21:52 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83DF399DDA; Thu, 7 Mar 2019 14:21:48 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D0965C1B5; Thu, 7 Mar 2019 14:21:39 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:45 +0100 Message-Id: <1551968334-18982-21-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 07 Mar 2019 14:21:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- 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 b8509fd..290023c 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -28,15 +28,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 32c8663..87440db 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -263,6 +263,9 @@ config ALLWINNER_A10 =20 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI =20 config STM32F205_SOC bool --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969769720143.26112584704367; Thu, 7 Mar 2019 06:42:49 -0800 (PST) Received: from localhost ([127.0.0.1]:52950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uEI-0007D7-Gh for importer@patchew.org; Thu, 07 Mar 2019 09:42:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tuZ-0006z1-9d for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tuX-00024p-BN for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60538) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tuE-0001hN-RD; Thu, 07 Mar 2019 09:21:59 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8AE28C05CDDF; Thu, 7 Mar 2019 14:21:52 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0F365C545; Thu, 7 Mar 2019 14:21:48 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:46 +0100 Message-Id: <1551968334-18982-22-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 07 Mar 2019 14:21:52 +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 v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" 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 --- 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 290023c..53609ea 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -29,12 +29,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 87440db..ed42e60 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -31,6 +31,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 =20 config EXYNOS4 bool --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969929965341.8870082801774; Thu, 7 Mar 2019 06:45:29 -0800 (PST) Received: from localhost ([127.0.0.1]:52986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uGz-0001Q3-Sw for importer@patchew.org; Thu, 07 Mar 2019 09:45:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tua-0006zx-4B for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tuY-00027d-Vx for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tuW-0001o4-Id; Thu, 07 Mar 2019 09:22:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C661307CB20; Thu, 7 Mar 2019 14:22:00 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE64B5C1B5; Thu, 7 Mar 2019 14:21:52 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:47 +0100 Message-Id: <1551968334-18982-23-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 07 Mar 2019 14:22:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the Sabrelite / iMX6 machine. Signed-off-by: Thomas Huth --- 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 53609ea..9150858 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -30,6 +30,7 @@ CONFIG_NETDUINO2=3Dy CONFIG_MPS2=3Dy CONFIG_RASPI=3Dy CONFIG_DIGIC=3Dy +CONFIG_SABRELITE=3Dy =20 CONFIG_VGA=3Dy CONFIG_SSI_M25P80=3Dy @@ -37,13 +38,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 ed42e60..cff2925 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -181,6 +181,10 @@ config REALVIEW select DS1338 # I2C RTC+NVRAM select USB_OHCI =20 +config SABRELITE + bool + select FSL_IMX6 + config STELLARIS bool select ARM_V7M @@ -296,6 +300,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 4f591ca..fadd698 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551970133170206.72457460322187; Thu, 7 Mar 2019 06:48:53 -0800 (PST) Received: from localhost ([127.0.0.1]:53044 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uK9-0003wc-4w for importer@patchew.org; Thu, 07 Mar 2019 09:48:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tua-00070H-Dh for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tuZ-00027n-3Y for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50462) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tuW-00022b-PQ; Thu, 07 Mar 2019 09:22:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D665C318A601; Thu, 7 Mar 2019 14:22:11 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7786F5C1B5; Thu, 7 Mar 2019 14:22:00 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:48 +0100 Message-Id: <1551968334-18982-24-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 07 Mar 2019 14:22:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 10 +++++++++- hw/arm/Makefile.objs | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 9150858..a01e407 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -31,9 +31,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 @@ -46,5 +46,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 cff2925..7df0bb6 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -325,7 +325,6 @@ config MPS2 select MPS2_SCC select PL022 # Serial port select PL080 # DMA controller - select TZ_MPC =20 config FSL_IMX7 bool @@ -339,9 +338,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 @@ -374,6 +381,7 @@ config ARMSSE select IOTKIT_SECCTL select IOTKIT_SYSCTL select IOTKIT_SYSINFO + select TZ_MPC select TZ_MSC select TZ_PPC =20 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fadd698..eae9f6c 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551970310111594.1312037728388; Thu, 7 Mar 2019 06:51:50 -0800 (PST) Received: from localhost ([127.0.0.1]:53101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uN6-0006UK-1L for importer@patchew.org; Thu, 07 Mar 2019 09:51:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tud-00073v-0M for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tuc-0002CJ-BU for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tua-00028Z-7u; Thu, 07 Mar 2019 09:22:16 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B4683092663; Thu, 7 Mar 2019 14:22:15 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 397755C28C; Thu, 7 Mar 2019 14:22:12 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:49 +0100 Message-Id: <1551968334-18982-25-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 07 Mar 2019 14:22:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index a01e407..88e4e8e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -34,7 +34,6 @@ CONFIG_SABRELITE=3Dy CONFIG_EMCRAFT_SF2=3Dy =20 CONFIG_VGA=3Dy -CONFIG_IMX_FEC=3Dy =20 CONFIG_NRF51_SOC=3Dy =20 @@ -46,4 +45,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 7df0bb6..6a8b801 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -289,6 +289,10 @@ config XLNX_VERSAL =20 config FSL_IMX25 bool + select IMX + select IMX_FEC + select IMX_I2C + select DS1338 =20 config FSL_IMX31 bool @@ -303,6 +307,7 @@ config FSL_IMX6 select A9MPCORE select IMX select IMX_I2C + select SDHCI =20 config ASPEED_SOC bool @@ -328,12 +333,25 @@ config MPS2 =20 config FSL_IMX7 bool + imply PCI_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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969562029270.1343606837187; Thu, 7 Mar 2019 06:39:22 -0800 (PST) Received: from localhost ([127.0.0.1]:52879 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uB3-0004G2-TX for importer@patchew.org; Thu, 07 Mar 2019 09:39:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tut-0007IS-Ju for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tur-0002XA-Jq for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60890) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tun-0002Rr-3V; Thu, 07 Mar 2019 09:22:29 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5BB443089ED8; Thu, 7 Mar 2019 14:22:28 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE1445C1B5; Thu, 7 Mar 2019 14:22:15 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:50 +0100 Message-Id: <1551968334-18982-26-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 07 Mar 2019 14:22:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add Kconfig dependencies for the NRF51 / microbit machine. Signed-off-by: Thomas Huth --- 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 88e4e8e..ee95cc0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -32,11 +32,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 6a8b801..da4d5c1 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -353,8 +353,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 eae9f6c..994e67d 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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551970463064484.65612096633254; Thu, 7 Mar 2019 06:54:23 -0800 (PST) Received: from localhost ([127.0.0.1]:53134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uPT-000089-N8 for importer@patchew.org; Thu, 07 Mar 2019 09:54:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tv0-0007NI-ND for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tv0-0002g5-2C for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49952) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tut-0002Z8-Sn; Thu, 07 Mar 2019 09:22:36 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2658A3082E70; Thu, 7 Mar 2019 14:22:35 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF1925C1B5; Thu, 7 Mar 2019 14:22:28 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:51 +0100 Message-Id: <1551968334-18982-27-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 07 Mar 2019 14:22:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This cleans up most settings in default-configs/aarch64-softmmu.mak. Signed-off-by: Thomas Huth --- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-= softmmu.mak index 4ea9add..3a4b15e 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 da4d5c1..adc38d4 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -283,6 +283,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 25116e6..5ea402c 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -108,3 +108,4 @@ config VIRTIO_VGA =20 config DPCD bool + select AUX --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551969796343887.0022097141474; Thu, 7 Mar 2019 06:43:16 -0800 (PST) Received: from localhost ([127.0.0.1]:52964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uEo-0007h2-5B for importer@patchew.org; Thu, 07 Mar 2019 09:43:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tv0-0007Nc-Th for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tv0-0002fy-0I for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tux-0002bU-Oe; Thu, 07 Mar 2019 09:22:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 765B786679; Thu, 7 Mar 2019 14:22:37 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58FFE51674; Thu, 7 Mar 2019 14:22:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:52 +0100 Message-Id: <1551968334-18982-28-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 07 Mar 2019 14:22:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- hw/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index adc38d4..3a04def 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -297,6 +297,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 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15519697429497.921466463409615; Thu, 7 Mar 2019 06:42:22 -0800 (PST) Received: from localhost ([127.0.0.1]:52944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uDy-0006uR-S1 for importer@patchew.org; Thu, 07 Mar 2019 09:42:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tv3-0007Pm-0Z for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tv2-0002ih-B6 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tv0-0002gI-O8; Thu, 07 Mar 2019 09:22:42 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E9CB7A737; Thu, 7 Mar 2019 14:22:41 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id D49275C5FD; Thu, 7 Mar 2019 14:22:37 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:53 +0100 Message-Id: <1551968334-18982-29-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 07 Mar 2019 14:22:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- hw/arm/Kconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 3a04def..7a0e0ba 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -77,6 +77,12 @@ config MAINSTONE select PFLASH_CFI01 select SMC91C111 =20 +config MUSCA + bool + select ARMSSE + select PL011 + select PL031 + config MUSICPAL bool select BITBANG_I2C @@ -429,6 +435,3 @@ config ARMSSE_CPUID =20 config ARMSSE_MHU bool - -config MUSCA - bool --=20 1.8.3.1 From nobody Tue May 21 08:54:17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551970611048496.7117262273907; Thu, 7 Mar 2019 06:56:51 -0800 (PST) Received: from localhost ([127.0.0.1]:53201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1uRz-0002QQ-2B for importer@patchew.org; Thu, 07 Mar 2019 09:56:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1tvB-0007Xw-51 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1tv9-0002nj-5h for qemu-devel@nongnu.org; Thu, 07 Mar 2019 09:22:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59794) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1tv4-0002k2-BW; Thu, 07 Mar 2019 09:22:46 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 874D230718E9; Thu, 7 Mar 2019 14:22:45 +0000 (UTC) Received: from thuth.com (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 40CC35C1B5; Thu, 7 Mar 2019 14:22:42 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, pbonzini@redhat.com, qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 15:18:54 +0100 Message-Id: <1551968334-18982-30-git-send-email-thuth@redhat.com> In-Reply-To: <1551968334-18982-1-git-send-email-thuth@redhat.com> References: <1551968334-18982-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 07 Mar 2019 14:22:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 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: Peter Maydell , John Snow , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 --- 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 ee95cc0..6b1f6a8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -33,14 +33,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 1.8.3.1