From patchwork Tue Apr 30 07:13:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 95E2314DB for ; Tue, 30 Apr 2019 07:15:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DF9A28A03 for ; Tue, 30 Apr 2019 07:15:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 706412886B; Tue, 30 Apr 2019 07:15:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11BE52886B for ; Tue, 30 Apr 2019 07:15:56 +0000 (UTC) Received: from localhost ([127.0.0.1]:40312 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzb-0006kH-BF for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:15:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMyM-0005SG-4G for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMyL-000455-9G for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:14:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56226) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMyH-00043G-7E; Tue, 30 Apr 2019 03:14:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A220C05D3E4; Tue, 30 Apr 2019 07:14:32 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57E97100200A; Tue, 30 Apr 2019 07:14:26 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:36 +0200 Message-Id: <20190430071405.16714-2-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 30 Apr 2019 07:14:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 01/30] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 b941a0e842..c04a5df651 100644 --- a/hw/pci/pci-stub.c +++ b/hw/pci/pci-stub.c @@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev) g_assert(false); return 0; } + +/* Required by ahci.c */ +bool msi_enabled(const PCIDevice *dev) +{ + return false; +} + +void msi_notify(PCIDevice *dev, unsigned int vector) +{ + g_assert_not_reached(); +} From patchwork Tue Apr 30 07:13:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 574ED14B6 for ; Tue, 30 Apr 2019 07:16:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41E842886B for ; Tue, 30 Apr 2019 07:16:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3632B28A41; Tue, 30 Apr 2019 07:16:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D17AB2886B for ; Tue, 30 Apr 2019 07:16:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:40320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzw-00073b-3X for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:16:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMya-0005eF-F0 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMyZ-0004EB-Gl for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:14:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38888) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMyV-0004CQ-6C; Tue, 30 Apr 2019 03:14:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3038A2D7F5; Tue, 30 Apr 2019 07:14:46 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5F0C1001E85; Tue, 30 Apr 2019 07:14:32 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:37 +0200 Message-Id: <20190430071405.16714-3-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 30 Apr 2019 07:14:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 02/30] hw/ide/ahci: Add a Kconfig switch for the AHCI-ICH9 device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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_device' We must only compile ich.c if CONFIG_PCI is available, too, so introduce a new config switch for this device. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth Acked-by: John Snow --- hw/ide/Kconfig | 6 +++++- hw/ide/Makefile.objs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index ab47b6a7a3..5d9106b1ac 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -43,10 +43,14 @@ config MICRODRIVE select IDE_QDEV config AHCI + bool + select IDE_QDEV + +config AHCI_ICH9 bool default y if PCI_DEVICES depends on PCI - select IDE_QDEV + select AHCI config IDE_SII3112 bool diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index a142add90e..faf04e0209 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o common-obj-$(CONFIG_IDE_VIA) += via.o common-obj-$(CONFIG_MICRODRIVE) += microdrive.o common-obj-$(CONFIG_AHCI) += ahci.o -common-obj-$(CONFIG_AHCI) += ich.o +common-obj-$(CONFIG_AHCI_ICH9) += ich.o common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) += sii3112.o From patchwork Tue Apr 30 07:13:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C0EEB14DB for ; Tue, 30 Apr 2019 07:19:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A838628A03 for ; Tue, 30 Apr 2019 07:19:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A37F28A44; Tue, 30 Apr 2019 07:19:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2B06428A03 for ; Tue, 30 Apr 2019 07:19:06 +0000 (UTC) Received: from localhost ([127.0.0.1]:40350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2f-00013k-Eq for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:19:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMyn-0005qc-Ap for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMyj-0004H6-Ih for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56376) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMyc-0004FD-IL; Tue, 30 Apr 2019 03:14:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A2F98C057F32; Tue, 30 Apr 2019 07:14:53 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79BE9100200A; Tue, 30 Apr 2019 07:14:46 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:38 +0200 Message-Id: <20190430071405.16714-4-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 30 Apr 2019 07:14:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 03/30] hw/usb/hcd-ohci: Do not use PCI functions with sysbus devices in ohci_die() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The ohci_die() function always assumes to be running with a PCI OHCI controller and calls the PCI-specific functions pci_set_word(). However, this function might also get called for the sysbus OHCI devices, so it likely fails in that case. To fix this issue, change the code now, so that there are two implementations now, one for sysbus and one for PCI, and use the right function via a function pointer in the OHCIState structure. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- hw/usb/hcd-ohci.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 81cf5ab7a5..6d3f556989 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -52,7 +52,7 @@ typedef struct OHCIPort { uint32_t ctrl; } OHCIPort; -typedef struct { +typedef struct OHCIState { USBBus bus; qemu_irq irq; MemoryRegion mem; @@ -108,6 +108,7 @@ typedef struct { uint32_t async_td; bool async_complete; + void (*ohci_die)(struct OHCIState *ohci); } OHCIState; /* Host Controller Communications Area */ @@ -302,7 +303,10 @@ struct ohci_iso_td { #define OHCI_HRESET_FSBIR (1 << 0) -static void ohci_die(OHCIState *ohci); +static void ohci_die(OHCIState *ohci) +{ + ohci->ohci_die(ohci); +} /* Update IRQ levels */ static inline void ohci_intr_update(OHCIState *ohci) @@ -1854,13 +1858,14 @@ static USBBusOps ohci_bus_ops = { static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports, dma_addr_t localmem_base, - char *masterbus, uint32_t firstport, - AddressSpace *as, Error **errp) + char *masterbus, uint32_t firstport, AddressSpace *as, + void (*ohci_die_fn)(struct OHCIState *), Error **errp) { Error *err = NULL; int i; ohci->as = as; + ohci->ohci_die = ohci_die_fn; if (num_ports > OHCI_MAX_PORTS) { error_setg(errp, "OHCI num-ports=%u is too big (limit is %u ports)", @@ -1933,18 +1938,28 @@ typedef struct { uint32_t firstport; } OHCIPCIState; -/** A typical O/EHCI will stop operating, set itself into error state - * (which can be queried by MMIO) and will set PERR in its config - * space to signal that it got an error +/** + * A typical OHCI will stop operating and set itself into error state + * (which can be queried by MMIO) to signal that it got an error. */ -static void ohci_die(OHCIState *ohci) +static void ohci_sysbus_die(struct OHCIState *ohci) { - OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state); - trace_usb_ohci_die(); ohci_set_interrupt(ohci, OHCI_INTR_UE); ohci_bus_stop(ohci); +} + +/** + * A typical PCI OHCI will additionally set PERR in its configspace to + * signal that it got an error. + */ +static void ohci_pci_die(struct OHCIState *ohci) +{ + OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state); + + ohci_sysbus_die(ohci); + pci_set_word(dev->parent_obj.config + PCI_STATUS, PCI_STATUS_DETECTED_PARITY); } @@ -1959,7 +1974,7 @@ static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp) usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0, ohci->masterbus, ohci->firstport, - pci_get_address_space(dev), &err); + pci_get_address_space(dev), ohci_pci_die, &err); if (err) { error_propagate(errp, err); return; @@ -2023,7 +2038,7 @@ static void ohci_realize_pxa(DeviceState *dev, Error **errp) usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset, s->masterbus, s->firstport, - &address_space_memory, &err); + &address_space_memory, ohci_sysbus_die, &err); if (err) { error_propagate(errp, err); return; From patchwork Tue Apr 30 07:13:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 84AD914DB for ; Tue, 30 Apr 2019 07:18:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6ABC328A41 for ; Tue, 30 Apr 2019 07:18:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EC3528A45; Tue, 30 Apr 2019 07:18:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1567928A41 for ; Tue, 30 Apr 2019 07:18:09 +0000 (UTC) Received: from localhost ([127.0.0.1]:40336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN1l-0000DF-19 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:18:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzR-0006SZ-3c for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzO-0004Wa-8J for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMyv-0004KI-9F; Tue, 30 Apr 2019 03:15:14 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D36273086227; Tue, 30 Apr 2019 07:15:08 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC02B1001DD2; Tue, 30 Apr 2019 07:14:53 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:39 +0200 Message-Id: <20190430071405.16714-5-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 30 Apr 2019 07:15:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 04/30] hw/usb/hcd-ohci: Move PCI-related code into a separate file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some machines (like the pxa2xx-based ARM machines) only have a sysbus OHCI controller, but no PCI. With the new Kconfig-style build system, it will soon be possible to create QEMU binaries that only contain such PCI-less machines. However, the two OHCI controllers, for sysbus and for PCI, are currently both located in one file, so the PCI code is still required for linking here. Move the OHCI-PCI device code into a separate file, so that it is possible to use the sysbus OHCI device also without the PCI dependency. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- hw/sh4/Kconfig | 2 +- hw/usb/Kconfig | 6 +- hw/usb/Makefile.objs | 1 + hw/usb/hcd-ohci-pci.c | 163 +++++++++++++++++++++++++++++++ hw/usb/hcd-ohci.c | 216 ++---------------------------------------- hw/usb/hcd-ohci.h | 104 ++++++++++++++++++++ 6 files changed, 284 insertions(+), 208 deletions(-) create mode 100644 hw/usb/hcd-ohci-pci.c create mode 100644 hw/usb/hcd-ohci.h diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig index 593662d28a..4cbce3a0ed 100644 --- a/hw/sh4/Kconfig +++ b/hw/sh4/Kconfig @@ -6,7 +6,7 @@ config R2D select I82378 if TEST_DEVICES select IDE_MMIO select PFLASH_CFI02 - select USB_OHCI + select USB_OHCI_PCI select PCI select SM501 select SH4 diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index a1b7acb12a..564305e283 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -8,10 +8,14 @@ config USB_UHCI select USB config USB_OHCI + bool + select USB + +config USB_OHCI_PCI bool default y if PCI_DEVICES depends on PCI - select USB + select USB_OHCI config USB_EHCI bool diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 2b929649ac..81688f6e70 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -5,6 +5,7 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o # usb host adapters common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o +common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c new file mode 100644 index 0000000000..e8f372c6ad --- /dev/null +++ b/hw/usb/hcd-ohci-pci.c @@ -0,0 +1,163 @@ +/* + * QEMU USB OHCI Emulation + * Copyright (c) 2004 Gianni Tedesco + * Copyright (c) 2006 CodeSourcery + * Copyright (c) 2006 Openedhand Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#include "qemu/osdep.h" +#include "hw/hw.h" +#include "qapi/error.h" +#include "qemu/timer.h" +#include "hw/usb.h" +#include "hw/pci/pci.h" +#include "hw/sysbus.h" +#include "hw/qdev-dma.h" +#include "trace.h" +#include "hcd-ohci.h" + +#define TYPE_PCI_OHCI "pci-ohci" +#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI) + +typedef struct { + /*< private >*/ + PCIDevice parent_obj; + /*< public >*/ + + OHCIState state; + char *masterbus; + uint32_t num_ports; + uint32_t firstport; +} OHCIPCIState; + +/** + * A typical PCI OHCI will additionally set PERR in its configspace to + * signal that it got an error. + */ +static void ohci_pci_die(struct OHCIState *ohci) +{ + OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state); + + ohci_sysbus_die(ohci); + + pci_set_word(dev->parent_obj.config + PCI_STATUS, + PCI_STATUS_DETECTED_PARITY); +} + +static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp) +{ + Error *err = NULL; + OHCIPCIState *ohci = PCI_OHCI(dev); + + dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */ + dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */ + + usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0, + ohci->masterbus, ohci->firstport, + pci_get_address_space(dev), ohci_pci_die, &err); + if (err) { + error_propagate(errp, err); + return; + } + + ohci->state.irq = pci_allocate_irq(dev); + pci_register_bar(dev, 0, 0, &ohci->state.mem); +} + +static void usb_ohci_exit(PCIDevice *dev) +{ + OHCIPCIState *ohci = PCI_OHCI(dev); + OHCIState *s = &ohci->state; + + trace_usb_ohci_exit(s->name); + ohci_bus_stop(s); + + if (s->async_td) { + usb_cancel_packet(&s->usb_packet); + s->async_td = 0; + } + ohci_stop_endpoints(s); + + if (!ohci->masterbus) { + usb_bus_release(&s->bus); + } + + timer_del(s->eof_timer); + timer_free(s->eof_timer); +} + +static void usb_ohci_reset_pci(DeviceState *d) +{ + PCIDevice *dev = PCI_DEVICE(d); + OHCIPCIState *ohci = PCI_OHCI(dev); + OHCIState *s = &ohci->state; + + ohci_hard_reset(s); +} + +static Property ohci_pci_properties[] = { + DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus), + DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3), + DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static const VMStateDescription vmstate_ohci = { + .name = "ohci", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState), + VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState), + VMSTATE_END_OF_LIST() + } +}; + +static void ohci_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->realize = usb_ohci_realize_pci; + k->exit = usb_ohci_exit; + k->vendor_id = PCI_VENDOR_ID_APPLE; + k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB; + k->class_id = PCI_CLASS_SERIAL_USB; + set_bit(DEVICE_CATEGORY_USB, dc->categories); + dc->desc = "Apple USB Controller"; + dc->props = ohci_pci_properties; + dc->hotpluggable = false; + dc->vmsd = &vmstate_ohci; + dc->reset = usb_ohci_reset_pci; +} + +static const TypeInfo ohci_pci_info = { + .name = TYPE_PCI_OHCI, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(OHCIPCIState), + .class_init = ohci_pci_class_init, + .interfaces = (InterfaceInfo[]) { + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; + +static void ohci_pci_register_types(void) +{ + type_register_static(&ohci_pci_info); +} + +type_init(ohci_pci_register_types) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 6d3f556989..aaba090588 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -30,87 +30,19 @@ #include "qapi/error.h" #include "qemu/timer.h" #include "hw/usb.h" -#include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/qdev-dma.h" #include "trace.h" +#include "hcd-ohci.h" /* This causes frames to occur 1000x slower */ //#define OHCI_TIME_WARP 1 -/* Number of Downstream Ports on the root hub. */ - -#define OHCI_MAX_PORTS 15 - #define ED_LINK_LIMIT 32 static int64_t usb_frame_time; static int64_t usb_bit_time; -typedef struct OHCIPort { - USBPort port; - uint32_t ctrl; -} OHCIPort; - -typedef struct OHCIState { - USBBus bus; - qemu_irq irq; - MemoryRegion mem; - AddressSpace *as; - uint32_t num_ports; - const char *name; - - QEMUTimer *eof_timer; - int64_t sof_time; - - /* OHCI state */ - /* Control partition */ - uint32_t ctl, status; - uint32_t intr_status; - uint32_t intr; - - /* memory pointer partition */ - uint32_t hcca; - uint32_t ctrl_head, ctrl_cur; - uint32_t bulk_head, bulk_cur; - uint32_t per_cur; - uint32_t done; - int32_t done_count; - - /* Frame counter partition */ - uint16_t fsmps; - uint8_t fit; - uint16_t fi; - uint8_t frt; - uint16_t frame_number; - uint16_t padding; - uint32_t pstart; - uint32_t lst; - - /* Root Hub partition */ - uint32_t rhdesc_a, rhdesc_b; - uint32_t rhstatus; - OHCIPort rhport[OHCI_MAX_PORTS]; - - /* PXA27x Non-OHCI events */ - uint32_t hstatus; - uint32_t hmask; - uint32_t hreset; - uint32_t htest; - - /* SM501 local memory offset */ - dma_addr_t localmem_base; - - /* Active packets. */ - uint32_t old_ctl; - USBPacket usb_packet; - uint8_t usb_buf[8192]; - uint32_t async_td; - bool async_complete; - - void (*ohci_die)(struct OHCIState *ohci); -} OHCIState; - /* Host Controller Communications Area */ struct ohci_hcca { uint32_t intr[32]; @@ -123,7 +55,6 @@ struct ohci_hcca { #define ED_WBACK_OFFSET offsetof(struct ohci_ed, head) #define ED_WBACK_SIZE 4 -static void ohci_bus_stop(OHCIState *ohci); static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev); /* Bitfields for the first word of an Endpoint Desciptor. */ @@ -430,7 +361,7 @@ static USBDevice *ohci_find_device(OHCIState *ohci, uint8_t addr) return NULL; } -static void ohci_stop_endpoints(OHCIState *ohci) +void ohci_stop_endpoints(OHCIState *ohci) { USBDevice *dev; int i, j; @@ -502,7 +433,7 @@ static void ohci_soft_reset(OHCIState *ohci) ohci->lst = OHCI_LS_THRESH; } -static void ohci_hard_reset(OHCIState *ohci) +void ohci_hard_reset(OHCIState *ohci) { ohci_soft_reset(ohci); ohci->ctl = 0; @@ -1376,7 +1307,7 @@ static int ohci_bus_start(OHCIState *ohci) } /* Stop sending SOF tokens on the bus */ -static void ohci_bus_stop(OHCIState *ohci) +void ohci_bus_stop(OHCIState *ohci) { trace_usb_ohci_stop(ohci->name); timer_del(ohci->eof_timer); @@ -1856,10 +1787,10 @@ static USBPortOps ohci_port_ops = { static USBBusOps ohci_bus_ops = { }; -static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, - uint32_t num_ports, dma_addr_t localmem_base, - char *masterbus, uint32_t firstport, AddressSpace *as, - void (*ohci_die_fn)(struct OHCIState *), Error **errp) +void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports, + dma_addr_t localmem_base, char *masterbus, + uint32_t firstport, AddressSpace *as, + void (*ohci_die_fn)(struct OHCIState *), Error **errp) { Error *err = NULL; int i; @@ -1924,25 +1855,11 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, ohci_frame_boundary, ohci); } -#define TYPE_PCI_OHCI "pci-ohci" -#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI) - -typedef struct { - /*< private >*/ - PCIDevice parent_obj; - /*< public >*/ - - OHCIState state; - char *masterbus; - uint32_t num_ports; - uint32_t firstport; -} OHCIPCIState; - /** * A typical OHCI will stop operating and set itself into error state * (which can be queried by MMIO) to signal that it got an error. */ -static void ohci_sysbus_die(struct OHCIState *ohci) +void ohci_sysbus_die(struct OHCIState *ohci) { trace_usb_ohci_die(); @@ -1950,71 +1867,6 @@ static void ohci_sysbus_die(struct OHCIState *ohci) ohci_bus_stop(ohci); } -/** - * A typical PCI OHCI will additionally set PERR in its configspace to - * signal that it got an error. - */ -static void ohci_pci_die(struct OHCIState *ohci) -{ - OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state); - - ohci_sysbus_die(ohci); - - pci_set_word(dev->parent_obj.config + PCI_STATUS, - PCI_STATUS_DETECTED_PARITY); -} - -static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp) -{ - Error *err = NULL; - OHCIPCIState *ohci = PCI_OHCI(dev); - - dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */ - dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */ - - usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0, - ohci->masterbus, ohci->firstport, - pci_get_address_space(dev), ohci_pci_die, &err); - if (err) { - error_propagate(errp, err); - return; - } - - ohci->state.irq = pci_allocate_irq(dev); - pci_register_bar(dev, 0, 0, &ohci->state.mem); -} - -static void usb_ohci_exit(PCIDevice *dev) -{ - OHCIPCIState *ohci = PCI_OHCI(dev); - OHCIState *s = &ohci->state; - - trace_usb_ohci_exit(s->name); - ohci_bus_stop(s); - - if (s->async_td) { - usb_cancel_packet(&s->usb_packet); - s->async_td = 0; - } - ohci_stop_endpoints(s); - - if (!ohci->masterbus) { - usb_bus_release(&s->bus); - } - - timer_del(s->eof_timer); - timer_free(s->eof_timer); -} - -static void usb_ohci_reset_pci(DeviceState *d) -{ - PCIDevice *dev = PCI_DEVICE(d); - OHCIPCIState *ohci = PCI_OHCI(dev); - OHCIState *s = &ohci->state; - - ohci_hard_reset(s); -} - #define TYPE_SYSBUS_OHCI "sysbus-ohci" #define SYSBUS_OHCI(obj) OBJECT_CHECK(OHCISysBusState, (obj), TYPE_SYSBUS_OHCI) @@ -2055,13 +1907,6 @@ static void usb_ohci_reset_sysbus(DeviceState *dev) ohci_hard_reset(ohci); } -static Property ohci_pci_properties[] = { - DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus), - DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3), - DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0), - DEFINE_PROP_END_OF_LIST(), -}; - static const VMStateDescription vmstate_ohci_state_port = { .name = "ohci-core/port", .version_id = 1, @@ -2090,7 +1935,7 @@ static const VMStateDescription vmstate_ohci_eof_timer = { }, }; -static const VMStateDescription vmstate_ohci_state = { +const VMStateDescription vmstate_ohci_state = { .name = "ohci-core", .version_id = 1, .minimum_version_id = 1, @@ -2137,46 +1982,6 @@ static const VMStateDescription vmstate_ohci_state = { } }; -static const VMStateDescription vmstate_ohci = { - .name = "ohci", - .version_id = 1, - .minimum_version_id = 1, - .fields = (VMStateField[]) { - VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState), - VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState), - VMSTATE_END_OF_LIST() - } -}; - -static void ohci_pci_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - - k->realize = usb_ohci_realize_pci; - k->exit = usb_ohci_exit; - k->vendor_id = PCI_VENDOR_ID_APPLE; - k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB; - k->class_id = PCI_CLASS_SERIAL_USB; - set_bit(DEVICE_CATEGORY_USB, dc->categories); - dc->desc = "Apple USB Controller"; - dc->props = ohci_pci_properties; - dc->hotpluggable = false; - dc->vmsd = &vmstate_ohci; - dc->reset = usb_ohci_reset_pci; -} - -static const TypeInfo ohci_pci_info = { - .name = TYPE_PCI_OHCI, - .parent = TYPE_PCI_DEVICE, - .instance_size = sizeof(OHCIPCIState), - .class_init = ohci_pci_class_init, - .interfaces = (InterfaceInfo[]) { - { INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, -}; - static Property ohci_sysbus_properties[] = { DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus), DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3), @@ -2205,7 +2010,6 @@ static const TypeInfo ohci_sysbus_info = { static void ohci_register_types(void) { - type_register_static(&ohci_pci_info); type_register_static(&ohci_sysbus_info); } diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h new file mode 100644 index 0000000000..16e3f1e13a --- /dev/null +++ b/hw/usb/hcd-ohci.h @@ -0,0 +1,104 @@ +/* + * QEMU USB OHCI Emulation + * Copyright (c) 2004 Gianni Tedesco + * Copyright (c) 2006 CodeSourcery + * Copyright (c) 2006 Openedhand Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +#ifndef HCD_OHCI_H +#define HCD_OHCI_H + +#include "sysemu/dma.h" + +/* Number of Downstream Ports on the root hub: */ +#define OHCI_MAX_PORTS 15 + +typedef struct OHCIPort { + USBPort port; + uint32_t ctrl; +} OHCIPort; + +typedef struct OHCIState { + USBBus bus; + qemu_irq irq; + MemoryRegion mem; + AddressSpace *as; + uint32_t num_ports; + const char *name; + + QEMUTimer *eof_timer; + int64_t sof_time; + + /* OHCI state */ + /* Control partition */ + uint32_t ctl, status; + uint32_t intr_status; + uint32_t intr; + + /* memory pointer partition */ + uint32_t hcca; + uint32_t ctrl_head, ctrl_cur; + uint32_t bulk_head, bulk_cur; + uint32_t per_cur; + uint32_t done; + int32_t done_count; + + /* Frame counter partition */ + uint16_t fsmps; + uint8_t fit; + uint16_t fi; + uint8_t frt; + uint16_t frame_number; + uint16_t padding; + uint32_t pstart; + uint32_t lst; + + /* Root Hub partition */ + uint32_t rhdesc_a, rhdesc_b; + uint32_t rhstatus; + OHCIPort rhport[OHCI_MAX_PORTS]; + + /* PXA27x Non-OHCI events */ + uint32_t hstatus; + uint32_t hmask; + uint32_t hreset; + uint32_t htest; + + /* SM501 local memory offset */ + dma_addr_t localmem_base; + + /* Active packets. */ + uint32_t old_ctl; + USBPacket usb_packet; + uint8_t usb_buf[8192]; + uint32_t async_td; + bool async_complete; + + void (*ohci_die)(struct OHCIState *ohci); +} OHCIState; + +extern const VMStateDescription vmstate_ohci_state; + +void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports, + dma_addr_t localmem_base, char *masterbus, + uint32_t firstport, AddressSpace *as, + void (*ohci_die_fn)(struct OHCIState *), Error **errp); +void ohci_bus_stop(OHCIState *ohci); +void ohci_stop_endpoints(OHCIState *ohci); +void ohci_hard_reset(OHCIState *ohci); +void ohci_sysbus_die(struct OHCIState *ohci); + +#endif From patchwork Tue Apr 30 07:13:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37AB4933 for ; Tue, 30 Apr 2019 07:22:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E085289D3 for ; Tue, 30 Apr 2019 07:22:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1118128A03; Tue, 30 Apr 2019 07:22:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 95841289D3 for ; Tue, 30 Apr 2019 07:22:26 +0000 (UTC) Received: from localhost ([127.0.0.1]:40430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN5t-00044l-Pb for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:22:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzK-0006Mk-D6 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzI-0004UN-CK for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51414) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMz1-0004PR-Gb; Tue, 30 Apr 2019 03:15:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2FD82C057E3A; Tue, 30 Apr 2019 07:15:15 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DCC8100200A; Tue, 30 Apr 2019 07:15:08 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:40 +0200 Message-Id: <20190430071405.16714-6-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 30 Apr 2019 07:15: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 v6 05/30] hw/arm: Express dependencies of the exynos machines with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the Exynos-related boards (nuri and smdkc210). This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 613d19a06d..2a11e76cc7 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -1,8 +1,14 @@ # Default configuration for arm-softmmu +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=y + CONFIG_PCI=y CONFIG_PCI_DEVICES=y CONFIG_PCI_TESTDEV=y + +CONFIG_EXYNOS4=y + CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y @@ -26,7 +32,6 @@ CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y -CONFIG_LAN9118=y CONFIG_SMC91C111=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y @@ -36,21 +41,15 @@ CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y -CONFIG_USB_EHCI_SYSBUS=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y CONFIG_ARM11MPCORE=y -CONFIG_A9MPCORE=y CONFIG_A15MPCORE=y -CONFIG_ARM_V7M=y CONFIG_NETDUINO2=y -CONFIG_ARM_GIC=y CONFIG_ARM_TIMER=y -CONFIG_ARM_MPTIMER=y -CONFIG_A9_GTIMER=y CONFIG_PL011=y CONFIG_PL022=y CONFIG_PL031=y @@ -61,11 +60,9 @@ CONFIG_PL080=y CONFIG_PL110=y CONFIG_PL181=y CONFIG_PL190=y -CONFIG_PL310=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_XGMAC=y -CONFIG_EXYNOS4=y CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y @@ -73,7 +70,6 @@ CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y -CONFIG_A9SCU=y CONFIG_DIGIC=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=y CONFIG_PCI_EXPRESS=y CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y -CONFIG_SDHCI=y CONFIG_INTEGRATOR=y CONFIG_INTEGRATOR_DEBUG=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index d298fbdc89..acd07b2add 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -8,7 +8,13 @@ config DIGIC config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS config HIGHBANK bool @@ -104,6 +110,10 @@ config ZAURUS config A9MPCORE bool + select A9_GTIMER + select A9SCU # snoop control unit + select ARM_GIC + select ARM_MPTIMER config A15MPCORE bool From patchwork Tue Apr 30 07:13:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5FF4E933 for ; Tue, 30 Apr 2019 07:25:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 426AE28779 for ; Tue, 30 Apr 2019 07:25:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 303F4288C5; Tue, 30 Apr 2019 07:25:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CBD5D28779 for ; Tue, 30 Apr 2019 07:25:38 +0000 (UTC) Received: from localhost ([127.0.0.1]:40494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN90-0006fb-3Y for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:25:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55316) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzV-0006gz-QV for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzU-0004bL-Lc for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMzG-0004So-De; Tue, 30 Apr 2019 03:15:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4CBB8811A9; Tue, 30 Apr 2019 07:15:29 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82E631001DD2; Tue, 30 Apr 2019 07:15:15 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:41 +0200 Message-Id: <20190430071405.16714-7-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 30 Apr 2019 07:15:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 06/30] hw/arm: Express dependencies of the highbank machines with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the highbank machine (and the midway machine). This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2a11e76cc7..50a4be3cad 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=y CONFIG_PCI_TESTDEV=y CONFIG_EXYNOS4=y +CONFIG_HIGHBANK=y CONFIG_VGA=y CONFIG_NAND=y @@ -45,24 +46,17 @@ CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y CONFIG_ARM11MPCORE=y -CONFIG_A15MPCORE=y CONFIG_NETDUINO2=y -CONFIG_ARM_TIMER=y -CONFIG_PL011=y -CONFIG_PL022=y -CONFIG_PL031=y CONFIG_PL041=y CONFIG_PL050=y -CONFIG_PL061=y CONFIG_PL080=y CONFIG_PL110=y CONFIG_PL181=y CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y -CONFIG_XGMAC=y CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y @@ -150,7 +144,6 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y -CONFIG_HIGHBANK=y CONFIG_MUSICPAL=y # for realview and versatilepb diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index acd07b2add..0ba377ac18 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -18,6 +18,17 @@ config EXYNOS4 config HIGHBANK bool + select A9MPCORE + select A15MPCORE + select AHCI + select ARM_TIMER # sp804 + select ARM_V7M + select PL011 # UART + select PL022 # Serial port + select PL031 # RTC + select PL061 # GPIO + select PL310 # cache controller + select XGMAC # ethernet config INTEGRATOR bool From patchwork Tue Apr 30 07:13:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE803933 for ; Tue, 30 Apr 2019 07:23:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B69C8289CF for ; Tue, 30 Apr 2019 07:23:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA65C289D6; Tue, 30 Apr 2019 07:23:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 51B54289CF for ; Tue, 30 Apr 2019 07:23:18 +0000 (UTC) Received: from localhost ([127.0.0.1]:40437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN6j-0004lC-DY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:23:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzV-0006h0-R1 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzU-0004bQ-LZ for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56820) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMzJ-0004UD-CH; Tue, 30 Apr 2019 03:15:38 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AB84C024AFF; Tue, 30 Apr 2019 07:15:35 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id A296D100200A; Tue, 30 Apr 2019 07:15:29 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:42 +0200 Message-Id: <20190430071405.16714-8-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 30 Apr 2019 07:15: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 v6 07/30] hw/arm: Express dependencies of integratorcp with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 8 +------- hw/arm/Kconfig | 8 ++++++++ hw/display/Kconfig | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 50a4be3cad..6195b75f48 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y +CONFIG_INTEGRATOR=y CONFIG_VGA=y CONFIG_NAND=y @@ -33,7 +34,6 @@ CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y -CONFIG_SMC91C111=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y CONFIG_NETDUINO2=y CONFIG_PL041=y -CONFIG_PL050=y CONFIG_PL080=y -CONFIG_PL110=y -CONFIG_PL181=y CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y CONFIG_PCI_EXPRESS=y CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y -CONFIG_INTEGRATOR=y -CONFIG_INTEGRATOR_DEBUG=y - CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0ba377ac18..ad3b1f9b40 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -32,6 +32,14 @@ config HIGHBANK config INTEGRATOR bool + select ARM_TIMER + select INTEGRATOR_DEBUG + select PL011 # UART + select PL031 # RTC + select PL050 # keyboard/mouse + select PL110 # pl111 LCD controller + select PL181 # display + select SMC91C111 config MAINSTONE bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 72be57a403..a11815c9af 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -21,6 +21,7 @@ config JAZZ_LED config PL110 bool + select FRAMEBUFFER config SII9022 bool From patchwork Tue Apr 30 07:13:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3CF7B14DB for ; Tue, 30 Apr 2019 07:29:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23AC228779 for ; Tue, 30 Apr 2019 07:29:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16C5E289D6; Tue, 30 Apr 2019 07:29:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5530428779 for ; Tue, 30 Apr 2019 07:29:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:40540 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNCF-0001Nz-Gr for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:28:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzf-0006tA-NE for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzd-0004dP-OH for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:15:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25991) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMzV-0004bW-Qb; Tue, 30 Apr 2019 03:15:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B0E3308338E; Tue, 30 Apr 2019 07:15:48 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5AC61001DD2; Tue, 30 Apr 2019 07:15:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:43 +0200 Message-Id: <20190430071405.16714-9-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Apr 2019 07:15: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 v6 08/30] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the fsl-imx31 / kzm machine. This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Peter Chubb Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 4 ++++ hw/misc/Kconfig | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 6195b75f48..7f94811ccb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y +CONFIG_FSL_IMX31=y CONFIG_VGA=y CONFIG_NAND=y @@ -68,7 +69,6 @@ CONFIG_TSC210X=y CONFIG_BLIZZARD=y CONFIG_ONENAND=y CONFIG_TUSB6010=y -CONFIG_IMX=y CONFIG_MAINSTONE=y CONFIG_MPS2=y CONFIG_MUSCA=y @@ -115,7 +115,6 @@ CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y CONFIG_FSL_IMX6=y -CONFIG_FSL_IMX31=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ad3b1f9b40..9087b7d714 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -98,6 +98,10 @@ config FSL_IMX25 config FSL_IMX31 bool + select SERIAL + select IMX + select IMX_I2C + select LAN9118 config FSL_IMX6 bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 5f67d0d6d9..385e1b0cec 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -76,6 +76,8 @@ config ECCMEMCTL config IMX bool select PTIMER + select SSI + select USB_EHCI_SYSBUS config STM32F2XX_SYSCFG bool From patchwork Tue Apr 30 07:13:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF6DB14B6 for ; Tue, 30 Apr 2019 07:20:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B851F28A03 for ; Tue, 30 Apr 2019 07:20:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC0D528A51; Tue, 30 Apr 2019 07:20:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D603D28A03 for ; Tue, 30 Apr 2019 07:20:29 +0000 (UTC) Received: from localhost ([127.0.0.1]:40399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN3r-00025k-3p for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:20:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzi-0006w9-OQ for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzh-0004fL-Ov for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38002) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMzb-0004cy-JG; Tue, 30 Apr 2019 03:15:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83BBF81DE1; Tue, 30 Apr 2019 07:15:54 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 951DD100200A; Tue, 30 Apr 2019 07:15:48 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:44 +0200 Message-Id: <20190430071405.16714-10-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 30 Apr 2019 07:15:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 09/30] hw/arm: Express dependencies of musicpal with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 7f94811ccb..0a4d293f8a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -11,13 +11,13 @@ CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y +CONFIG_MUSICPAL=y CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y CONFIG_MAX7310=y -CONFIG_WM8750=y CONFIG_TWL92230=y CONFIG_TSC2005=y CONFIG_LM832X=y @@ -40,7 +40,6 @@ CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y CONFIG_PFLASH_CFI01=y -CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y CONFIG_PLATFORM_BUS=y @@ -56,14 +55,12 @@ CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_PXA2XX=y -CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y CONFIG_DIGIC=y -CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y CONFIG_TSC210X=y CONFIG_BLIZZARD=y @@ -137,7 +134,6 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y -CONFIG_MUSICPAL=y # for realview and versatilepb CONFIG_LSI_SCSI_PCI=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 9087b7d714..b9f3c3c232 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -46,7 +46,12 @@ config MAINSTONE config MUSICPAL bool + select BITBANG_I2C + select MARVELL_88W8618 select PTIMER + select PFLASH_CFI02 + select SERIAL + select WM8750 config NETDUINO2 bool From patchwork Tue Apr 30 07:13:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 680DE933 for ; Tue, 30 Apr 2019 07:23:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E9C5289CF for ; Tue, 30 Apr 2019 07:23:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 422D6289D6; Tue, 30 Apr 2019 07:23:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEFF5289CF for ; Tue, 30 Apr 2019 07:23:28 +0000 (UTC) Received: from localhost ([127.0.0.1]:40439 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN6s-0004sk-Uv for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:23:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMzx-0007FO-Rx for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMzw-0004mA-QL for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52090) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMzp-0004jd-Gj; Tue, 30 Apr 2019 03:16:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DB4A30ADBBA; Tue, 30 Apr 2019 07:16:08 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD55B1001E85; Tue, 30 Apr 2019 07:15:54 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:45 +0200 Message-Id: <20190430071405.16714-11-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 30 Apr 2019 07:16:08 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 10/30] hw/arm: Express dependencies of the OMAP machines with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the OMAP machines (cheetah, n800, n810, sx1 and sx1-v1). This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 17 ++++------------- hw/arm/Kconfig | 25 +++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 0a4d293f8a..b7ed3c530b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -12,16 +12,16 @@ CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y CONFIG_MUSICPAL=y +CONFIG_MUSCA=y +CONFIG_CHEETAH=y +CONFIG_SX1=y +CONFIG_NSERIES=y CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y CONFIG_MAX7310=y -CONFIG_TWL92230=y -CONFIG_TSC2005=y -CONFIG_LM832X=y -CONFIG_TMP105=y CONFIG_TMP421=y CONFIG_PCA9552=y CONFIG_STELLARIS=y @@ -39,9 +39,7 @@ CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y -CONFIG_PFLASH_CFI01=y CONFIG_MICRODRIVE=y -CONFIG_USB_MUSB=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y @@ -61,15 +59,8 @@ CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y CONFIG_DIGIC=y -CONFIG_OMAP=y -CONFIG_TSC210X=y -CONFIG_BLIZZARD=y -CONFIG_ONENAND=y -CONFIG_TUSB6010=y CONFIG_MAINSTONE=y CONFIG_MPS2=y -CONFIG_MUSCA=y -CONFIG_NSERIES=y CONFIG_RASPI=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b9f3c3c232..71126254ff 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -2,6 +2,11 @@ config ARM_VIRT bool imply VFIO_PLATFORM +config CHEETAH + bool + select OMAP + select TSC210X + config DIGIC bool select PTIMER @@ -58,9 +63,25 @@ config NETDUINO2 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 config OMAP bool + select FRAMEBUFFER + select I2C + select ECC + select NAND + select PFLASH_CFI01 + select SD + select SERIAL config PXA2XX bool @@ -74,6 +95,10 @@ config STELLARIS config STRONGARM bool +config SX1 + bool + select OMAP + config VERSATILE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fa57c7c770..8302b8df1d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -9,7 +9,8 @@ obj-$(CONFIG_MAINSTONE) += mainstone.o obj-$(CONFIG_MUSICPAL) += musicpal.o obj-$(CONFIG_NETDUINO2) += netduino2.o obj-$(CONFIG_NSERIES) += nseries.o -obj-$(CONFIG_OMAP) += omap_sx1.o palm.o +obj-$(CONFIG_SX1) += omap_sx1.o +obj-$(CONFIG_CHEETAH) += palm.o obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o obj-$(CONFIG_REALVIEW) += realview.o obj-$(CONFIG_STELLARIS) += stellaris.o From patchwork Tue Apr 30 07:13:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7EF711395 for ; Tue, 30 Apr 2019 07:32:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6647828898 for ; Tue, 30 Apr 2019 07:32:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A6F328A85; Tue, 30 Apr 2019 07:32:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F0C2928A81 for ; Tue, 30 Apr 2019 07:32:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:40621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNFA-0004MP-1a for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:32:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN01-0007IN-Oy for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN00-0004nU-Sn for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38364) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLMzw-0004m3-Sc; Tue, 30 Apr 2019 03:16:16 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE5BF3082A32; Tue, 30 Apr 2019 07:16:15 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8A711001DD2; Tue, 30 Apr 2019 07:16:08 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:46 +0200 Message-Id: <20190430071405.16714-12-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 30 Apr 2019 07:16: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 v6 11/30] hw/arm: Express dependencies of stellaris with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé --- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index b7ed3c530b..3f82d635e4 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_MUSCA=y CONFIG_CHEETAH=y CONFIG_SX1=y CONFIG_NSERIES=y +CONFIG_STELLARIS=y CONFIG_VGA=y CONFIG_NAND=y @@ -24,16 +25,10 @@ CONFIG_SERIAL=y CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_STELLARIS=y -CONFIG_STELLARIS_INPUT=y -CONFIG_STELLARIS_ENET=y -CONFIG_SSD0303=y -CONFIG_SSD0323=y CONFIG_DDC=y CONFIG_SII9022=y CONFIG_ADS7846=y CONFIG_MAX111X=y -CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 71126254ff..e5a8ae5ef9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -91,6 +91,17 @@ config REALVIEW config STELLARIS bool + select ARM_V7M + select CMSDK_APB_WATCHDOG + 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 config STRONGARM bool From patchwork Tue Apr 30 07:13:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0D2E414B6 for ; Tue, 30 Apr 2019 07:21:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8619289CF for ; Tue, 30 Apr 2019 07:21:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9531289D6; Tue, 30 Apr 2019 07:21:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4CCF4289CF for ; Tue, 30 Apr 2019 07:21:26 +0000 (UTC) Received: from localhost ([127.0.0.1]:40417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN4v-0003N0-IY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:21:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN0N-0007Zj-D9 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN0L-0004tP-H8 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42104) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN0D-0004qL-H1; Tue, 30 Apr 2019 03:16:33 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 785FC3091786; Tue, 30 Apr 2019 07:16:32 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34C1F100200A; Tue, 30 Apr 2019 07:16:16 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:47 +0200 Message-Id: <20190430071405.16714-13-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 30 Apr 2019 07:16:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 12/30] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 24 ++++------------- hw/arm/Kconfig | 48 +++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- hw/display/Kconfig | 1 + hw/i2c/Kconfig | 2 +- 5 files changed, 57 insertions(+), 21 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 3f82d635e4..df7d9421e0 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -3,9 +3,8 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_PCI_TESTDEV=y +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y @@ -17,6 +16,9 @@ CONFIG_CHEETAH=y CONFIG_SX1=y CONFIG_NSERIES=y CONFIG_STELLARIS=y +CONFIG_REALVIEW=y +CONFIG_VERSATILE=y +CONFIG_VEXPRESS=y CONFIG_VGA=y CONFIG_NAND=y @@ -25,8 +27,6 @@ CONFIG_SERIAL=y CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_DDC=y -CONFIG_SII9022=y CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI_M25P80=y @@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y -CONFIG_ARM11MPCORE=y - CONFIG_NETDUINO2=y -CONFIG_PL041=y -CONFIG_PL080=y -CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_PXA2XX=y @@ -52,12 +47,10 @@ CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y -CONFIG_ARM11SCU=y CONFIG_DIGIC=y CONFIG_MAINSTONE=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y @@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y CONFIG_ARMSSE_MHU=y -CONFIG_VERSATILE=y -CONFIG_VERSATILE_PCI=y -CONFIG_VERSATILE_I2C=y - CONFIG_PCI_EXPRESS=y CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y @@ -120,6 +109,3 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y - -# for realview and versatilepb -CONFIG_LSI_SCSI_PCI=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e5a8ae5ef9..f0e112e778 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -88,6 +88,30 @@ config PXA2XX config REALVIEW bool + imply PCI_DEVICES + imply PCI_TESTDEV + select SMC91C111 + select LAN9118 + select A9MPCORE + select A15MPCORE + select ARM11MPCORE + select ARM_TIMER + select VERSATILE_PCI + select WM8750 # audio codec + select LSI_SCSI_PCI + select PCI + select PL011 # UART + select PL031 # RTC + select PL041 # audio codec + select PL050 # keyboard/mouse + select PL061 # GPIO + select PL080 # DMA controller + select PL110 + select PL181 # display + select PL310 # cache controller + select VERSATILE_I2C + select DS1338 # I2C RTC+NVRAM + select USB_OHCI config STELLARIS bool @@ -112,6 +136,29 @@ config SX1 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 config ZYNQ bool @@ -184,6 +231,7 @@ config A15MPCORE config ARM11MPCORE bool + select ARM11SCU config ARMSSE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 8302b8df1d..bd0b45a799 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -15,7 +15,8 @@ obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o obj-$(CONFIG_REALVIEW) += realview.o obj-$(CONFIG_STELLARIS) += stellaris.o obj-$(CONFIG_STRONGARM) += collie.o -obj-$(CONFIG_VERSATILE) += vexpress.o versatilepb.o +obj-$(CONFIG_VERSATILE) += versatilepb.o +obj-$(CONFIG_VEXPRESS) += vexpress.o obj-$(CONFIG_ZYNQ) += xilinx_zynq.o obj-$(CONFIG_ARM_V7M) += armv7m.o diff --git a/hw/display/Kconfig b/hw/display/Kconfig index a11815c9af..0577e68c8e 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -26,6 +26,7 @@ config PL110 config SII9022 bool depends on I2C + select DDC config SSD0303 bool diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 820b24de5b..aee961541c 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -12,7 +12,7 @@ config DDC config VERSATILE_I2C bool - select I2C + select BITBANG_I2C config ACPI_SMBUS bool From patchwork Tue Apr 30 07:13:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922909 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBAD314DB for ; Tue, 30 Apr 2019 07:24:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E79289CF for ; Tue, 30 Apr 2019 07:24:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96269289D6; Tue, 30 Apr 2019 07:24:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1E465289CF for ; Tue, 30 Apr 2019 07:24:28 +0000 (UTC) Received: from localhost ([127.0.0.1]:40447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN7r-0005gh-Af for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:24:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN0a-0007gk-6Y for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN0Z-0004z5-2n for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:16:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38498) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN0N-0004uB-Cl; Tue, 30 Apr 2019 03:16:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 410DC3082B44; Tue, 30 Apr 2019 07:16:42 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEB661001E85; Tue, 30 Apr 2019 07:16:32 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:48 +0200 Message-Id: <20190430071405.16714-14-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 30 Apr 2019 07:16: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 v6 13/30] hw/arm: Express dependencies of the PXA2xx machines with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 15 ++++-------- hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 5 +++- 3 files changed, 51 insertions(+), 11 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index df7d9421e0..f39a854f2e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -19,22 +19,20 @@ CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VERSATILE=y CONFIG_VEXPRESS=y +CONFIG_MAINSTONE=y +CONFIG_GUMSTIX=y +CONFIG_SPITZ=y +CONFIG_TOSA=y +CONFIG_Z2=y CONFIG_VGA=y -CONFIG_NAND=y -CONFIG_ECC=y -CONFIG_SERIAL=y -CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_ADS7846=y -CONFIG_MAX111X=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y -CONFIG_MICRODRIVE=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y @@ -42,16 +40,13 @@ CONFIG_NETDUINO2=y CONFIG_PL330=y CONFIG_CADENCE=y -CONFIG_PXA2XX=y CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y CONFIG_DIGIC=y -CONFIG_MAINSTONE=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y CONFIG_STM32F2XX_USART=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f0e112e778..79706ed0ce 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -48,6 +48,9 @@ config INTEGRATOR config MAINSTONE bool + select PXA2XX + select PFLASH_CFI01 + select SMC91C111 config MUSICPAL bool @@ -85,6 +88,43 @@ config OMAP config PXA2XX bool + select FRAMEBUFFER + select I2C + select SERIAL + select SD + select SSI + select USB_OHCI + +config GUMSTIX + bool + select PFLASH_CFI01 + select SMC91C111 + select PXA2XX + +config TOSA + bool + select ZAURUS # scoop + select MICRODRIVE + select PXA2XX + +config SPITZ + bool + select ADS7846 # display + select MAX111X # A/D converter + select WM8750 # audio codec + select MAX7310 # GPIO expander + select ZAURUS # scoop + select NAND # memory + select ECC # Error-correcting for NAND + select MICRODRIVE + select PXA2XX + +config Z2 + bool + select PFLASH_CFI01 + select WM8750 + select PL011 # UART + select PXA2XX config REALVIEW bool @@ -218,6 +258,8 @@ config MSF2 config ZAURUS bool + select NAND + select ECC config A9MPCORE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index bd0b45a799..00328d1b0b 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -11,7 +11,10 @@ obj-$(CONFIG_NETDUINO2) += netduino2.o obj-$(CONFIG_NSERIES) += nseries.o obj-$(CONFIG_SX1) += omap_sx1.o obj-$(CONFIG_CHEETAH) += palm.o -obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o +obj-$(CONFIG_GUMSTIX) += gumstix.o +obj-$(CONFIG_SPITZ) += spitz.o +obj-$(CONFIG_TOSA) += tosa.o +obj-$(CONFIG_Z2) += z2.o obj-$(CONFIG_REALVIEW) += realview.o obj-$(CONFIG_STELLARIS) += stellaris.o obj-$(CONFIG_STRONGARM) += collie.o From patchwork Tue Apr 30 07:13:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922915 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 160F814DB for ; Tue, 30 Apr 2019 07:27:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6B7428779 for ; Tue, 30 Apr 2019 07:27:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8EAA288C5; Tue, 30 Apr 2019 07:27:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7CF2128779 for ; Tue, 30 Apr 2019 07:27:23 +0000 (UTC) Received: from localhost ([127.0.0.1]:40528 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNAg-0008SO-MO for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:27:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN0e-0007lg-Ci for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN0d-00051S-Et for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN0X-0004yU-F7; Tue, 30 Apr 2019 03:16:53 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 842D33086201; Tue, 30 Apr 2019 07:16:52 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88C4F100200A; Tue, 30 Apr 2019 07:16:42 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:49 +0200 Message-Id: <20190430071405.16714-15-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 30 Apr 2019 07:16:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 14/30] hw/arm: Express dependencies of xilinx-zynq with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the xilinx-zynq-a9 board. This patch is based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index f39a854f2e..af78e7c892 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -19,6 +19,7 @@ CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VERSATILE=y CONFIG_VEXPRESS=y +CONFIG_ZYNQ=y CONFIG_MAINSTONE=y CONFIG_GUMSTIX=y CONFIG_SPITZ=y @@ -38,16 +39,11 @@ CONFIG_VIRTIO_MMIO=y CONFIG_NETDUINO2=y -CONFIG_PL330=y -CONFIG_CADENCE=y CONFIG_FRAMEBUFFER=y -CONFIG_XILINX_SPIPS=y -CONFIG_ZYNQ_DEVCFG=y CONFIG_DIGIC=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y CONFIG_STM32F2XX_USART=y CONFIG_STM32F2XX_SYSCFG=y @@ -100,7 +96,6 @@ CONFIG_SMBUS_EEPROM=y CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y -CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 79706ed0ce..dfdc1b1fd6 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -202,6 +202,18 @@ config VEXPRESS config ZYNQ bool + select A9MPCORE + select CADENCE # UART + select PFLASH_CFI02 + select PL330 + select SDHCI + select SSI_M25P80 + select USB_EHCI_SYSBUS + select XILINX # UART + select XILINX_AXI + select XILINX_SPI + select XILINX_SPIPS + select ZYNQ_DEVCFG config ARM_V7M bool From patchwork Tue Apr 30 07:13:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922923 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 82E2E1395 for ; Tue, 30 Apr 2019 07:30:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 689B928A16 for ; Tue, 30 Apr 2019 07:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B95728A4F; Tue, 30 Apr 2019 07:30:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0374F28A4F for ; Tue, 30 Apr 2019 07:30:14 +0000 (UTC) Received: from localhost ([127.0.0.1]:40580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNDR-0002QE-7o for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:30:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN0y-00082W-AP for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN0w-00057K-BV for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN0h-00052D-Qf; Tue, 30 Apr 2019 03:17:03 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE83830832CC; Tue, 30 Apr 2019 07:17:01 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0F061001E85; Tue, 30 Apr 2019 07:16:52 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:50 +0200 Message-Id: <20190430071405.16714-16-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Apr 2019 07:17:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 15/30] hw/arm: Express dependencies of collie with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the Strongarm collie machine. This patch is based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 af78e7c892..25e8f717ac 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y CONFIG_SPITZ=y CONFIG_TOSA=y CONFIG_Z2=y +CONFIG_COLLIE=y CONFIG_VGA=y CONFIG_TMP421=y @@ -97,5 +98,3 @@ CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y CONFIG_PCI_EXPRESS_DESIGNWARE=y - -CONFIG_STRONGARM=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index dfdc1b1fd6..a507144d9a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -169,6 +169,13 @@ config STELLARIS config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM config SX1 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 00328d1b0b..729e711b87 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) += tosa.o obj-$(CONFIG_Z2) += z2.o obj-$(CONFIG_REALVIEW) += realview.o obj-$(CONFIG_STELLARIS) += stellaris.o -obj-$(CONFIG_STRONGARM) += collie.o +obj-$(CONFIG_COLLIE) += collie.o obj-$(CONFIG_VERSATILE) += versatilepb.o obj-$(CONFIG_VEXPRESS) += vexpress.o obj-$(CONFIG_ZYNQ) += xilinx_zynq.o From patchwork Tue Apr 30 07:13:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8CD0017DF for ; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 795A5288BB for ; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CB2A288BC; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 17DE0288C4 for ; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) Received: from localhost ([127.0.0.1]:40695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNJR-0007oP-7P for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:36:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN17-00086z-GV for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN16-0005Ab-LQ for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN0w-000573-Cs; Tue, 30 Apr 2019 03:17:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07A1633025E; Tue, 30 Apr 2019 07:17:17 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C3521001DD2; Tue, 30 Apr 2019 07:17:02 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:51 +0200 Message-Id: <20190430071405.16714-17-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 30 Apr 2019 07:17:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 16/30] hw/arm: Express dependencies of the aspeed boards with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Dependencies have been determined by looking at hw/arm/aspeed.c Reviewed-by: Cédric Le Goater Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 25e8f717ac..2580584281 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -26,15 +26,12 @@ CONFIG_SPITZ=y CONFIG_TOSA=y CONFIG_Z2=y CONFIG_COLLIE=y +CONFIG_ASPEED_SOC=y CONFIG_VGA=y -CONFIG_TMP421=y -CONFIG_PCA9552=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y -CONFIG_FTGMAC100=y -CONFIG_DS1338=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y @@ -92,8 +89,6 @@ CONFIG_I82801B11=y CONFIG_ACPI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y -CONFIG_ASPEED_SOC=y -CONFIG_SMBUS_EEPROM=y CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index a507144d9a..95ac0b540e 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -255,6 +255,16 @@ config FSL_IMX6 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 config MPS2 bool From patchwork Tue Apr 30 07:13:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 314AF1395 for ; Tue, 30 Apr 2019 07:39:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FBB6288C6 for ; Tue, 30 Apr 2019 07:39:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 131D2289CF; Tue, 30 Apr 2019 07:39:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A26E8288C6 for ; Tue, 30 Apr 2019 07:39:21 +0000 (UTC) Received: from localhost ([127.0.0.1]:40733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNMG-0001yz-Sc for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:39:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN1A-000896-AK for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN19-0005BX-AD for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN14-00059p-JF; Tue, 30 Apr 2019 03:17:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4BCCFC02490D; Tue, 30 Apr 2019 07:17:25 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F9D7100200A; Tue, 30 Apr 2019 07:17:17 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:52 +0200 Message-Id: <20190430071405.16714-18-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 30 Apr 2019 07:17:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 17/30] hw/arm: Express dependencies of the virt machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Dependencies have been determined by looking at hw/arm/virt.c Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/aarch64-softmmu.mak | 1 - default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 4ea9add003..313490fb38 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -9,4 +9,3 @@ CONFIG_DPCD=y CONFIG_XLNX_ZYNQMP=y CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y -CONFIG_ARM_SMMUV3=y diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2580584281..f440a2b1cd 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n +CONFIG_ARM_VIRT=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y @@ -32,8 +33,6 @@ CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y -CONFIG_PLATFORM_BUS=y -CONFIG_VIRTIO_MMIO=y CONFIG_NETDUINO2=y @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y CONFIG_ARMSSE_MHU=y -CONFIG_PCI_EXPRESS=y -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y - CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y @@ -86,10 +82,5 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_ACPI=y -CONFIG_ARM_VIRT=y -CONFIG_SMBIOS=y -CONFIG_GPIO_KEY=y CONFIG_MSF2=y -CONFIG_FW_CFG_DMA=y CONFIG_PCI_EXPRESS_DESIGNWARE=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 95ac0b540e..2b63adb667 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,6 +1,24 @@ config ARM_VIRT bool + imply PCI_DEVICES + imply TEST_DEVICES + imply VFIO_AMD_XGBE imply VFIO_PLATFORM + imply VFIO_XGMAC + select A15MPCORE + select ACPI + select ARM_SMMUV3 + select GPIO_KEY + select FW_CFG_DMA + select PCI_EXPRESS + select PCI_EXPRESS_GENERIC_BRIDGE + select PFLASH_CFI01 + select PL011 # UART + select PL031 # RTC + select PL061 # GPIO + select PLATFORM_BUS + select SMBIOS + select VIRTIO_MMIO config CHEETAH bool @@ -299,6 +317,7 @@ config A9MPCORE config A15MPCORE bool + select ARM_GIC config ARM11MPCORE bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 729e711b87..4f591ca487 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,4 +1,5 @@ -obj-y += boot.o sysbus-fdt.o +obj-y += boot.o +obj-$(CONFIG_PLATFORM_BUS) += sysbus-fdt.o obj-$(CONFIG_ARM_VIRT) += virt.o obj-$(CONFIG_ACPI) += virt-acpi-build.o obj-$(CONFIG_DIGIC) += digic_boards.o From patchwork Tue Apr 30 07:13:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A0049933 for ; Tue, 30 Apr 2019 07:28:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 860F128779 for ; Tue, 30 Apr 2019 07:28:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79EB4288C5; Tue, 30 Apr 2019 07:28:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1F00328779 for ; Tue, 30 Apr 2019 07:28:34 +0000 (UTC) Received: from localhost ([127.0.0.1]:40534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNBk-0000vh-B6 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:28:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN1J-0008Gz-Iz for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN1I-0005D6-Kg for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN1E-0005C3-Lf; Tue, 30 Apr 2019 03:17:36 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B87BD859FB; Tue, 30 Apr 2019 07:17:35 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7EAF1001E85; Tue, 30 Apr 2019 07:17:25 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:53 +0200 Message-Id: <20190430071405.16714-19-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 30 Apr 2019 07:17:36 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 18/30] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Netduino only depends on the stm32f205 SoC which in turn depends on its components. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 f440a2b1cd..c86a9f5427 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -28,25 +28,18 @@ CONFIG_TOSA=y CONFIG_Z2=y CONFIG_COLLIE=y CONFIG_ASPEED_SOC=y +CONFIG_NETDUINO2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y -CONFIG_NETDUINO2=y - CONFIG_FRAMEBUFFER=y CONFIG_DIGIC=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_STM32F2XX_TIMER=y -CONFIG_STM32F2XX_USART=y -CONFIG_STM32F2XX_SYSCFG=y -CONFIG_STM32F2XX_ADC=y -CONFIG_STM32F2XX_SPI=y -CONFIG_STM32F205_SOC=y CONFIG_NRF51_SOC=y CONFIG_CMSDK_APB_TIMER=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2b63adb667..25ba109773 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -81,6 +81,7 @@ config MUSICPAL config NETDUINO2 bool + select STM32F205_SOC config NSERIES bool @@ -251,6 +252,12 @@ config RASPI config STM32F205_SOC bool + select ARM_V7M + select STM32F2XX_TIMER + select STM32F2XX_USART + select STM32F2XX_SYSCFG + select STM32F2XX_ADC + select STM32F2XX_SPI config XLNX_ZYNQMP_ARM bool From patchwork Tue Apr 30 07:13:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 91919933 for ; Tue, 30 Apr 2019 07:33:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74B4E28779 for ; Tue, 30 Apr 2019 07:33:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64C6E287FA; Tue, 30 Apr 2019 07:33:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E4A6228779 for ; Tue, 30 Apr 2019 07:33:14 +0000 (UTC) Received: from localhost ([127.0.0.1]:40623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNGM-0005GV-7s for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:33:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN1U-0008Qo-8i for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN1T-0005Fh-BD for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:17:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45092) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN1P-0005EM-69; Tue, 30 Apr 2019 03:17:47 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31C8330833A3; Tue, 30 Apr 2019 07:17:46 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CFC7100200A; Tue, 30 Apr 2019 07:17:35 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:54 +0200 Message-Id: <20190430071405.16714-20-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Apr 2019 07:17:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 19/30] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add dependencies for the Cubitech Cubieboard. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 c86a9f5427..a0b9016e3a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -7,6 +7,7 @@ CONFIG_ARM_V7M=y # CONFIG_TEST_DEVICES=n CONFIG_ARM_VIRT=y +CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y @@ -32,7 +33,6 @@ CONFIG_NETDUINO2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y -CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FRAMEBUFFER=y @@ -60,10 +60,6 @@ CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y CONFIG_ARMSSE_MHU=y -CONFIG_ALLWINNER_A10_PIT=y -CONFIG_ALLWINNER_A10_PIC=y -CONFIG_ALLWINNER_A10=y - CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 25ba109773..0e89383f50 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -25,6 +25,10 @@ config CHEETAH select OMAP select TSC210X +config CUBIEBOARD + bool + select ALLWINNER_A10 + config DIGIC bool select PTIMER @@ -246,6 +250,11 @@ config ARM_V7M config ALLWINNER_A10 bool + select AHCI + select ALLWINNER_A10_PIT + select ALLWINNER_A10_PIC + select ALLWINNER_EMAC + select SERIAL config RASPI bool From patchwork Tue Apr 30 07:13:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922917 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 914E3933 for ; Tue, 30 Apr 2019 07:28:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 720A028779 for ; Tue, 30 Apr 2019 07:28:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64DF8288C5; Tue, 30 Apr 2019 07:28:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D4BE28779 for ; Tue, 30 Apr 2019 07:28:26 +0000 (UTC) Received: from localhost ([127.0.0.1]:40532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNBh-0000t2-HS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:28:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN1f-00009x-8e for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN1e-0005Iq-6b for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38144) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN1Z-0005HI-Sm; Tue, 30 Apr 2019 03:17:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0F3730832CC; Tue, 30 Apr 2019 07:17:56 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CBAE1001E85; Tue, 30 Apr 2019 07:17:46 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:55 +0200 Message-Id: <20190430071405.16714-21-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Apr 2019 07:17:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 20/30] hw/arm: Express dependencies of the MPS2 boards with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the mps2-an* machines. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 20 +------------------- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index a0b9016e3a..31d31d3f4a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -30,6 +30,7 @@ CONFIG_Z2=y CONFIG_COLLIE=y CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y +CONFIG_MPS2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y @@ -38,28 +39,9 @@ CONFIG_IMX_FEC=y CONFIG_FRAMEBUFFER=y CONFIG_DIGIC=y -CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_NRF51_SOC=y -CONFIG_CMSDK_APB_TIMER=y -CONFIG_CMSDK_APB_DUALTIMER=y -CONFIG_CMSDK_APB_UART=y -CONFIG_CMSDK_APB_WATCHDOG=y - -CONFIG_MPS2_FPGAIO=y -CONFIG_MPS2_SCC=y - -CONFIG_TZ_MPC=y -CONFIG_TZ_MSC=y -CONFIG_TZ_PPC=y -CONFIG_ARMSSE=y -CONFIG_IOTKIT_SECCTL=y -CONFIG_IOTKIT_SYSCTL=y -CONFIG_IOTKIT_SYSINFO=y -CONFIG_ARMSSE_CPUID=y -CONFIG_ARMSSE_MHU=y - CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0e89383f50..55f7e5bfce 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -302,6 +302,12 @@ config ASPEED_SOC config MPS2 bool + select ARMSSE + select LAN9118 + select MPS2_FPGAIO + select MPS2_SCC + select PL022 # Serial port + select PL080 # DMA controller config FSL_IMX7 bool @@ -341,6 +347,19 @@ config ARM11MPCORE config ARMSSE bool + select ARM_V7M + select ARMSSE_CPUID + select ARMSSE_MHU + select CMSDK_APB_TIMER + select CMSDK_APB_DUALTIMER + select CMSDK_APB_UART + select CMSDK_APB_WATCHDOG + select IOTKIT_SECCTL + select IOTKIT_SYSCTL + select IOTKIT_SYSINFO + select TZ_MPC + select TZ_MSC + select TZ_PPC config ARMSSE_CPUID bool From patchwork Tue Apr 30 07:13:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D453D1398 for ; Tue, 30 Apr 2019 07:42:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4DC328802 for ; Tue, 30 Apr 2019 07:42:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7BB3289CE; Tue, 30 Apr 2019 07:42:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5B99C28802 for ; Tue, 30 Apr 2019 07:42:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:40823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNOp-0004IV-F0 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:41:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN1o-0000J5-53 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN1n-0005So-Ar for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45266) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN1j-0005Ox-7p; Tue, 30 Apr 2019 03:18:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 493BA30832E3; Tue, 30 Apr 2019 07:18:06 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 376B01001DD2; Tue, 30 Apr 2019 07:17:57 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:56 +0200 Message-Id: <20190430071405.16714-22-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Apr 2019 07:18:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 21/30] hw/arm: Express dependencies of the raspi machines with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Most of the code is directly controlled by the CONFIG_RASPI switch, so not much to add here additionally. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 31d31d3f4a..22bff20b32 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -31,15 +31,13 @@ CONFIG_COLLIE=y CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_MPS2=y +CONFIG_RASPI=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y -CONFIG_FRAMEBUFFER=y - CONFIG_DIGIC=y -CONFIG_RASPI=y CONFIG_NRF51_SOC=y CONFIG_FSL_IMX6=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 55f7e5bfce..40be78303c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -258,6 +258,9 @@ config ALLWINNER_A10 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI config STM32F205_SOC bool From patchwork Tue Apr 30 07:13:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4819C1395 for ; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31610288BB for ; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 224C0288C5; Tue, 30 Apr 2019 07:36:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C9C89288BB for ; Tue, 30 Apr 2019 07:36:25 +0000 (UTC) Received: from localhost ([127.0.0.1]:40693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNJQ-0007np-Rc for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:36:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN20-0000UK-6q for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN1z-0005dQ-DX for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45378) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN1v-0005VZ-Gc; Tue, 30 Apr 2019 03:18:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8053830832CC; Tue, 30 Apr 2019 07:18:18 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BD0F1001DD2; Tue, 30 Apr 2019 07:18:06 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:57 +0200 Message-Id: <20190430071405.16714-23-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Apr 2019 07:18: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 v6 22/30] hw/arm: Express dependencies of canon-a1100 with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the DIGIC / canon-a1100 machine. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 22bff20b32..76508e3910 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -32,12 +32,12 @@ CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_MPS2=y CONFIG_RASPI=y +CONFIG_DIGIC=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y -CONFIG_DIGIC=y CONFIG_NRF51_SOC=y CONFIG_FSL_IMX6=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 40be78303c..abf2af0967 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -32,6 +32,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 config EXYNOS4 bool From patchwork Tue Apr 30 07:13:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D35621395 for ; Tue, 30 Apr 2019 07:43:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C44D828802 for ; Tue, 30 Apr 2019 07:43:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B871C289D3; Tue, 30 Apr 2019 07:43:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 25F5928802 for ; Tue, 30 Apr 2019 07:43:47 +0000 (UTC) Received: from localhost ([127.0.0.1]:40839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNQY-0005UI-GG for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:43:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2C-0000dc-Dn for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN2B-0005hf-HD for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN26-0005fN-Fh; Tue, 30 Apr 2019 03:18:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 809FD30B9335; Tue, 30 Apr 2019 07:18:29 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id E47E310021B5; Tue, 30 Apr 2019 07:18:18 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:58 +0200 Message-Id: <20190430071405.16714-24-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 30 Apr 2019 07:18:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 23/30] hw/arm: Express dependencies of sabrelite with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the Sabrelite / iMX6 machine. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 9 +++++++++ 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 76508e3910..ef7dd7156a 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_DIGIC=y +CONFIG_SABRELITE=y CONFIG_VGA=y CONFIG_SSI_M25P80=y @@ -40,13 +41,10 @@ CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y -CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_IMX_I2C=y - CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index abf2af0967..0a1eab568b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -177,6 +177,11 @@ config REALVIEW select DS1338 # I2C RTC+NVRAM select USB_OHCI +config SABRELITE + bool + select FSL_IMX6 + select SSI_M25P80 + config STELLARIS bool select ARM_V7M @@ -290,6 +295,10 @@ config FSL_IMX31 config FSL_IMX6 bool + select A9MPCORE + select IMX + select IMX_FEC + select IMX_I2C config ASPEED_SOC bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 4f591ca487..fadd69882c 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -22,6 +22,7 @@ obj-$(CONFIG_COLLIE) += collie.o obj-$(CONFIG_VERSATILE) += versatilepb.o obj-$(CONFIG_VEXPRESS) += vexpress.o obj-$(CONFIG_ZYNQ) += xilinx_zynq.o +obj-$(CONFIG_SABRELITE) += sabrelite.o obj-$(CONFIG_ARM_V7M) += armv7m.o obj-$(CONFIG_EXYNOS4) += exynos4210.o @@ -36,7 +37,7 @@ obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o obj-$(CONFIG_XLNX_VERSAL) += xlnx-versal.o xlnx-versal-virt.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o -obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o +obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MPS2) += mps2-tz.o From patchwork Tue Apr 30 07:13:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 41E7A1395 for ; Tue, 30 Apr 2019 07:31:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 283F628A4E for ; Tue, 30 Apr 2019 07:31:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1AD4328A81; Tue, 30 Apr 2019 07:31:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B1B4428A4E for ; Tue, 30 Apr 2019 07:31:48 +0000 (UTC) Received: from localhost ([127.0.0.1]:40618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNEx-0004As-W4 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:31:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2O-0000pT-VK for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN2N-0005lK-Tq for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14556) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN2J-0005jp-FA; Tue, 30 Apr 2019 03:18:43 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 699163091785; Tue, 30 Apr 2019 07:18:42 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9A3C1001DD2; Tue, 30 Apr 2019 07:18:29 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:13:59 +0200 Message-Id: <20190430071405.16714-25-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 30 Apr 2019 07:18: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 v6 24/30] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the emcraft-sf2 machine - we also distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 8 ++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ef7dd7156a..1455d083d8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -34,9 +34,9 @@ CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y +CONFIG_EMCRAFT_SF2=y CONFIG_VGA=y -CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y @@ -49,5 +49,4 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_MSF2=y CONFIG_PCI_EXPRESS_DESIGNWARE=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0a1eab568b..7af94a8184 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -334,9 +334,17 @@ config FSL_IMX6UL config NRF51_SOC bool +config EMCRAFT_SF2 + bool + select MSF2 + select SSI_M25P80 + config MSF2 bool + select ARM_V7M select PTIMER + select SERIAL + select SSI config ZAURUS bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fadd69882c..eae9f6c442 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) += virt.o obj-$(CONFIG_ACPI) += virt-acpi-build.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-$(CONFIG_EXYNOS4) += exynos4_boards.o +obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o obj-$(CONFIG_HIGHBANK) += highbank.o obj-$(CONFIG_INTEGRATOR) += integratorcp.o obj-$(CONFIG_MAINSTONE) += mainstone.o @@ -41,7 +42,7 @@ obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MPS2) += mps2-tz.o -obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o +obj-$(CONFIG_MSF2) += msf2-soc.o obj-$(CONFIG_MUSCA) += musca.o obj-$(CONFIG_ARMSSE) += armsse.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o From patchwork Tue Apr 30 07:14:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 08E021398 for ; Tue, 30 Apr 2019 07:39:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBC83288C6 for ; Tue, 30 Apr 2019 07:39:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF2EA289CF; Tue, 30 Apr 2019 07:39:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8235A288C6 for ; Tue, 30 Apr 2019 07:39:20 +0000 (UTC) Received: from localhost ([127.0.0.1]:40731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNMF-0001xZ-Pp for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:39:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2X-0000yI-7G for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN2W-0005oV-9m for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:18:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN2R-0005m6-PX; Tue, 30 Apr 2019 03:18:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BB609307D90D; Tue, 30 Apr 2019 07:18:50 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1E5E10021B4; Tue, 30 Apr 2019 07:18:42 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:00 +0200 Message-Id: <20190430071405.16714-26-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 30 Apr 2019 07:18:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 25/30] hw/arm: Express dependencies of the remaining IMX boards with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 1455d083d8..6dc388c43e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y CONFIG_VGA=y -CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y @@ -49,4 +48,3 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_PCI_EXPRESS_DESIGNWARE=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7af94a8184..4a14749792 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -285,6 +285,10 @@ config XLNX_VERSAL config FSL_IMX25 bool + select IMX + select IMX_FEC + select IMX_I2C + select DS1338 config FSL_IMX31 bool @@ -299,6 +303,7 @@ config FSL_IMX6 select IMX select IMX_FEC select IMX_I2C + select SDHCI config ASPEED_SOC bool @@ -324,12 +329,26 @@ config MPS2 config FSL_IMX7 bool + imply PCI_DEVICES + imply TEST_DEVICES + select A15MPCORE + select PCI + select IMX + select IMX_FEC + select IMX_I2C + select PCI_EXPRESS_DESIGNWARE + select SDHCI config ARM_SMMUV3 bool config FSL_IMX6UL bool + select A15MPCORE + select IMX + select IMX_FEC + select IMX_I2C + select SDHCI config NRF51_SOC bool From patchwork Tue Apr 30 07:14:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A287D1395 for ; Tue, 30 Apr 2019 07:38:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90D60288C5 for ; Tue, 30 Apr 2019 07:38:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 836D82896D; Tue, 30 Apr 2019 07:38:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 292A4288C5 for ; Tue, 30 Apr 2019 07:38:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:40729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNLJ-0001AZ-Ej for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:38:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2p-0001DX-Kh for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN2o-000602-NC for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39326) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN2f-0005uF-O0; Tue, 30 Apr 2019 03:19:05 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B65663082B44; Tue, 30 Apr 2019 07:19:04 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E7F81001E85; Tue, 30 Apr 2019 07:18:50 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:01 +0200 Message-Id: <20190430071405.16714-27-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 30 Apr 2019 07:19:04 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 26/30] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add Kconfig dependencies for the NRF51 / microbit machine. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 6dc388c43e..233937f394 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -35,11 +35,10 @@ CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y +CONFIG_MICROBIT=y CONFIG_VGA=y -CONFIG_NRF51_SOC=y - CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 4a14749792..da091ac217 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -350,8 +350,14 @@ config FSL_IMX6UL select IMX_I2C select SDHCI +config MICROBIT + bool + select NRF51_SOC + config NRF51_SOC bool + select I2C + select ARM_V7M config EMCRAFT_SF2 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index eae9f6c442..994e67dd0d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o obj-$(CONFIG_HIGHBANK) += highbank.o obj-$(CONFIG_INTEGRATOR) += integratorcp.o obj-$(CONFIG_MAINSTONE) += mainstone.o +obj-$(CONFIG_MICROBIT) += microbit.o obj-$(CONFIG_MUSICPAL) += musicpal.o obj-$(CONFIG_NETDUINO2) += netduino2.o obj-$(CONFIG_NSERIES) += nseries.o @@ -48,4 +49,4 @@ obj-$(CONFIG_ARMSSE) += armsse.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o From patchwork Tue Apr 30 07:14:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D1901395 for ; Tue, 30 Apr 2019 07:46:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D51E28969 for ; Tue, 30 Apr 2019 07:46:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E90D289CE; Tue, 30 Apr 2019 07:46:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D0E7B28969 for ; Tue, 30 Apr 2019 07:46:36 +0000 (UTC) Received: from localhost ([127.0.0.1]:40895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNTH-0007jv-Nw for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:46:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN2w-0001Jg-LG for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN2u-00061Z-Nu for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN2p-0005zx-3F; Tue, 30 Apr 2019 03:19:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E997821F3; Tue, 30 Apr 2019 07:19:14 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CA451001DD2; Tue, 30 Apr 2019 07:19:04 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:02 +0200 Message-Id: <20190430071405.16714-28-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 30 Apr 2019 07:19:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 27/30] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This cleans up most settings in default-configs/aarch64-softmmu.mak. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 313490fb38..49ff415ee4 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -3,9 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_AUX=y -CONFIG_DDC=y -CONFIG_DPCD=y -CONFIG_XLNX_ZYNQMP=y CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index da091ac217..eff61efab9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -279,6 +279,17 @@ config STM32F205_SOC config XLNX_ZYNQMP_ARM bool + select AHCI + select ARM_GIC + select CADENCE + select DDC + select DPCD + select SDHCI + select SSI + select SSI_M25P80 + select XILINX_AXI + select XILINX_SPIPS + select XLNX_ZYNQMP config XLNX_VERSAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 0577e68c8e..bb95f8d6a4 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -108,6 +108,7 @@ config VIRTIO_VGA config DPCD bool + select AUX config ATI_VGA bool From patchwork Tue Apr 30 07:14:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922931 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2F301395 for ; Tue, 30 Apr 2019 07:33:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA88C28779 for ; Tue, 30 Apr 2019 07:33:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDD35287FA; Tue, 30 Apr 2019 07:33:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 79A5028779 for ; Tue, 30 Apr 2019 07:33:17 +0000 (UTC) Received: from localhost ([127.0.0.1]:40625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNGO-0005Ik-PZ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:33:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN3B-0001W5-RG for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN3A-0006Gs-Th for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54950) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN35-00069i-At; Tue, 30 Apr 2019 03:19:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 876A33082E56; Tue, 30 Apr 2019 07:19:26 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8847F1000049; Tue, 30 Apr 2019 07:19:15 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:03 +0200 Message-Id: <20190430071405.16714-29-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 30 Apr 2019 07:19:26 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 28/30] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Dependencies have been determined with trial-and-error and by looking at the xlnx-versal.c source file. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 eff61efab9..9609caef87 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -293,6 +293,10 @@ config XLNX_ZYNQMP_ARM config XLNX_VERSAL bool + select ARM_GIC + select PL011 + select CADENCE + select VIRTIO_MMIO config FSL_IMX25 bool From patchwork Tue Apr 30 07:14:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3AB6814DB for ; Tue, 30 Apr 2019 07:48:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DA0828969 for ; Tue, 30 Apr 2019 07:48:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F6EB289CE; Tue, 30 Apr 2019 07:48:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8DDC28969 for ; Tue, 30 Apr 2019 07:48:31 +0000 (UTC) Received: from localhost ([127.0.0.1]:40907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNV8-0000TZ-VS for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:48:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN3Q-0001j2-V2 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN3N-0006RP-8e for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN3D-0006Ip-N2; Tue, 30 Apr 2019 03:19:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B064AE6A72; Tue, 30 Apr 2019 07:19:37 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id D952E100200A; Tue, 30 Apr 2019 07:19:26 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:04 +0200 Message-Id: <20190430071405.16714-30-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 30 Apr 2019 07:19:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 29/30] hw/arm: Express dependencies of the musca machines with Kconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Dependencies have been determined with trial-and-error and by looking at the musca.c source file. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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 9609caef87..af8cffde9c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -75,6 +75,12 @@ config MAINSTONE select PFLASH_CFI01 select SMC91C111 +config MUSCA + bool + select ARMSSE + select PL011 + select PL031 + config MUSICPAL bool select BITBANG_I2C @@ -427,6 +433,3 @@ config ARMSSE_CPUID config ARMSSE_MHU bool - -config MUSCA - bool From patchwork Tue Apr 30 07:14:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 10922953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9B1861395 for ; Tue, 30 Apr 2019 07:36:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86920288BB for ; Tue, 30 Apr 2019 07:36:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 799EB288C4; Tue, 30 Apr 2019 07:36:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 23624288BB for ; Tue, 30 Apr 2019 07:36:27 +0000 (UTC) Received: from localhost ([127.0.0.1]:40697 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLNJS-0007pf-Ej for patchwork-qemu-devel@patchwork.kernel.org; Tue, 30 Apr 2019 03:36:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLN3V-0001pU-F1 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLN3U-0006WI-Kt for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:19:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLN3N-0006RJ-HQ; Tue, 30 Apr 2019 03:19:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9942D307D962; Tue, 30 Apr 2019 07:19:48 +0000 (UTC) Received: from thuth.com (ovpn-116-190.ams2.redhat.com [10.36.116.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 170D11001E85; Tue, 30 Apr 2019 07:19:37 +0000 (UTC) From: Thomas Huth To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Date: Tue, 30 Apr 2019 09:14:05 +0200 Message-Id: <20190430071405.16714-31-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 30 Apr 2019 07:19: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 v6 30/30] hw/arm: Remove hard-enablement of the remaining PCI devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Gerd Hoffmann , "Edgar E . Iglesias" , Subbaraya Sundeep , Rob Herring , qemu-block@nongnu.org, Andrey Smirnov , Antony Pavlov , Joel Stanley , Alistair Francis , Beniamino Galvani , qemu-arm@nongnu.org, Jan Kiszka , Cedric Le Goater , John Snow , Igor Mitsyanko , Philippe Mathieu-Daude , Jean-Christophe Dubois , Andrew Jeffery , Peter Chubb , Aurelien Jarno Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Tested-by: Philippe Mathieu-Daudé 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 233937f394..f23ecfd5c5 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -36,14 +36,6 @@ CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y CONFIG_MICROBIT=y - -CONFIG_VGA=y - CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y - -CONFIG_PCIE_PORT=y -CONFIG_XIO3130=y -CONFIG_IOH3420=y -CONFIG_I82801B11=y