From patchwork Mon Mar 11 00:56:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Hfp670MNz9s4V for ; Mon, 11 Mar 2019 11:57:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53278 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39Fk-0006uo-Tu for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 20:57:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39F9-0006tw-Rg for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:56:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39F9-00072x-5M for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:56:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39F8-00072V-SX for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:56:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B57FC057F32; Mon, 11 Mar 2019 00:56:38 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 43DAB60C45; Mon, 11 Mar 2019 00:56:32 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:12 +0100 Message-Id: <20190311005618.19007-2-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 11 Mar 2019 00:56: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 v3 1/7] hw/mips: Express dependencies of the MIPSsim 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 0795d522db..8c5fdf5ee1 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -26,7 +26,6 @@ CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index cdc07e59b6..3433e97e1a 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -6,6 +6,9 @@ config MALTA config MIPSSIM bool + select ISA_BUS + select SERIAL_ISA + select MIPSNET config JAZZ bool From patchwork Mon Mar 11 00:56:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Hfpb21h0z9s4Y for ; Mon, 11 Mar 2019 11:57:43 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39G9-00077q-3C for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 20:57:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39FO-00075s-W5 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:56:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39FK-000783-UO for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:56:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60422) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39FH-000750-4v for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:56:49 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6FBB307E049; Mon, 11 Mar 2019 00:56:44 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8CF7560C18; Mon, 11 Mar 2019 00:56:38 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:13 +0100 Message-Id: <20190311005618.19007-3-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 11 Mar 2019 00:56:44 +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 v3 2/7] hw/mips: Express dependencies of the Jazz 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The framebuffer display is managed by a G364, the network card is a Sonic DP83932. A QLogic ESP216 provides a SCSI bus. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas) --- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 5 ----- default-configs/mips64el-softmmu.mak | 5 ----- hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 8c5fdf5ee1..caebafd416 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -3,7 +3,6 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y -CONFIG_ESP=y CONFIG_VGA_ISA=y CONFIG_VGA_ISA_MM=y CONFIG_VGA_CIRRUS=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index bad7496672..a169738635 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -1,9 +1,4 @@ # Default configuration for mips64-softmmu include mips-softmmu-common.mak -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 8b255efc54..a7b88318b2 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -2,13 +2,8 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y -CONFIG_RC4030=y -CONFIG_DP8393X=y -CONFIG_DS1225Y=y CONFIG_FULONG=y CONFIG_JAZZ=y -CONFIG_G364FB=y -CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_AHCI=y CONFIG_MIPS_BOSTON=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 3433e97e1a..ab006477c7 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -12,6 +12,23 @@ config MIPSSIM config JAZZ bool + select ISA_BUS + select RC4030 + select I8259 + select I8254 + select I8257 + select PCSPK + select VGA_ISA_MM + select G364FB + select DP8393X + select ESP + select FDC + select MC146818RTC + select PCKBD + select SERIAL + select PARALLEL + select DS1225Y + select JAZZ_LED config FULONG bool From patchwork Mon Mar 11 00:56:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44HfsQ40HCz9s4Y for ; Mon, 11 Mar 2019 12:00:10 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39IW-0000rK-Fl for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 21:00:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39FU-0007AZ-S9 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39FU-0007Ci-3F for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39FT-0007Bh-S5 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 17204307D978; Mon, 11 Mar 2019 00:56:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48A6960C18; Mon, 11 Mar 2019 00:56:45 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:14 +0100 Message-Id: <20190311005618.19007-4-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 11 Mar 2019 00:56:59 +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 v3 3/7] hw/mips: Express dependencies of the r4k platform 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This platform use standard PC devices connected to an ISA bus. Networking is provided by a ne2000 chipset. Signed-off-by: Philippe Mathieu-Daudé --- v3: remove CONFIG_NE2000_ISA (Thomas) add PFLASH_CFI01 --- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index caebafd416..2ca57bfee1 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -24,7 +24,6 @@ CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index ab006477c7..5678c9cf15 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,5 +1,16 @@ config R4K bool + select ISA_BUS + select SERIAL_ISA + select I8259 + select I8254 + select MC146818RTC + select VGA_ISA + select NE2000_ISA + select IDE_ISA + # I8042 + select PCKBD + select PFLASH_CFI01 config MALTA bool From patchwork Mon Mar 11 00:56:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Hfry5WJyz9s4V for ; Mon, 11 Mar 2019 11:59:45 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39I6-0000SD-7b for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 20:59:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39Fa-0007Fs-Dn for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39FZ-0007HA-Jn for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6661) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39FZ-0007FO-DV for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9727E3688E; Mon, 11 Mar 2019 00:57:04 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE1F860C18; Mon, 11 Mar 2019 00:56:59 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:15 +0100 Message-Id: <20190311005618.19007-5-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 11 Mar 2019 00:57: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 v3 4/7] hw/mips: Remove the redundant CONFIG_MIPS_ITU Makefile variable 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Inter-Thread Communication Unit (ITU, introduced in commit 34fa7e83e11) is part of the Coherent Processing System (CPS), as describe in commit 408294352ad: Make ITU available in the system if CPU supports multithreading and is part of CPS. Replate the CONFIG_MIPS_ITU variable by the CONFIG_MIPS_CPS one. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips-softmmu-common.mak | 1 - hw/misc/Kconfig | 3 --- hw/misc/Makefile.objs | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 2ca57bfee1..c5b148b1c6 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -29,7 +29,6 @@ CONFIG_I8259=y CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y -CONFIG_MIPS_ITU=y CONFIG_R4K=y CONFIG_MALTA=y CONFIG_MIPSSIM=y diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 2c60be99bc..3125cf86f2 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -80,9 +80,6 @@ config IMX config STM32F2XX_SYSCFG bool -config MIPS_ITU - bool - config MPS2_FPGAIO bool diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index c71e07ae35..22565d72af 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -59,7 +59,7 @@ obj-$(CONFIG_ZYNQ) += zynq-xadc.o obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o obj-$(CONFIG_MIPS_CPS) += mips_cmgcr.o obj-$(CONFIG_MIPS_CPS) += mips_cpc.o -obj-$(CONFIG_MIPS_ITU) += mips_itu.o +obj-$(CONFIG_MIPS_CPS) += mips_itu.o obj-$(CONFIG_MPS2_FPGAIO) += mps2-fpgaio.o obj-$(CONFIG_MPS2_SCC) += mps2-scc.o From patchwork Mon Mar 11 00:56:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44HfvL21wgz9s4Y for ; Mon, 11 Mar 2019 12:01:50 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39K8-00029I-4h for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 21:01:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39Fi-0007N7-Pr for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39Fi-0007N2-1f for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43226) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39Fh-0007Mi-S2 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0A34083F45; Mon, 11 Mar 2019 00:57:13 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9976D60C18; Mon, 11 Mar 2019 00:57:05 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:16 +0100 Message-Id: <20190311005618.19007-6-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 11 Mar 2019 00:57:13 +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 v3 5/7] hw/mips: Express dependencies of the Boston 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Boston is built around a Xilinx FPGA, which includes a PCIe root port and an UART. An Intel EG20T PCH connects the I/O peripherals, but only the SATA bus is emulated. Reviewed-by: Thomas Huth Reviewed-by: Paul Burton Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips64el-softmmu.mak | 4 ---- hw/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index a7b88318b2..c7409d23d2 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -5,8 +5,4 @@ CONFIG_IDE_VIA=y CONFIG_FULONG=y CONFIG_JAZZ=y CONFIG_VT82C686=y -CONFIG_AHCI=y CONFIG_MIPS_BOSTON=y -CONFIG_FITLOADER=y -CONFIG_PCI_EXPRESS=y -CONFIG_PCI_EXPRESS_XILINX=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 5678c9cf15..bd6e3be2cd 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -50,3 +50,8 @@ config MIPS_CPS config MIPS_BOSTON bool + select FITLOADER + select MIPS_CPS + select PCI_EXPRESS_XILINX + select AHCI + select SERIAL From patchwork Mon Mar 11 00:56:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Hfvt2Lw7z9s4V for ; Mon, 11 Mar 2019 12:02:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39Ka-0002QO-A5 for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 21:02:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39Ft-0007Ue-4q for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39Fs-0007TU-Dn for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39Fs-0007TA-7p for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72E5B308425A; Mon, 11 Mar 2019 00:57:23 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BCC0160C18; Mon, 11 Mar 2019 00:57:14 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:17 +0100 Message-Id: <20190311005618.19007-7-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 11 Mar 2019 00:57:23 +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 v3 6/7] hw/pci-host: Use CONFIG_PCI_BONITO to select the Bonito North Bridge 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- default-configs/mips64el-softmmu.mak | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/Makefile.objs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index c7409d23d2..88b66a91d7 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -3,6 +3,7 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=y +CONFIG_PCI_BONITO=y CONFIG_JAZZ=y CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index b39ea297ba..9abadafaf5 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX config PCI_EXPRESS_DESIGNWARE bool select PCI_EXPRESS + +config PCI_BONITO + select PCI + bool diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index a9cd3e022d..d6e86b9b89 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o -common-obj-$(CONFIG_FULONG) += bonito.o +common-obj-$(CONFIG_PCI_BONITO) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o From patchwork Mon Mar 11 00:56:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1054088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44HfqQ52Yqz9s4V for ; Mon, 11 Mar 2019 11:58:26 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39Gq-0007cf-EP for incoming@patchwork.ozlabs.org; Sun, 10 Mar 2019 20:58:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h39G0-0007bK-OT for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h39G0-0007Yb-1f for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h39Fz-0007Y7-Ro for qemu-devel@nongnu.org; Sun, 10 Mar 2019 20:57:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 15F48307E04A; Mon, 11 Mar 2019 00:57:31 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-18.brq.redhat.com [10.40.204.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F326660C18; Mon, 11 Mar 2019 00:57:23 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , Paolo Bonzini , qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 01:56:18 +0100 Message-Id: <20190311005618.19007-8-philmd@redhat.com> In-Reply-To: <20190311005618.19007-1-philmd@redhat.com> References: <20190311005618.19007-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 11 Mar 2019 00:57:31 +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 v3 7/7] hw/mips: Express dependencies of the Fulong 2E 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: Yang Zhong , Paul Burton , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , =?utf-8?q?Philippe_Math?= =?utf-8?q?ieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Fulong 2E machine uses a Loongson 2E as CPU, a Bonito64 system controller as North Bridge and a VT82C686 chipset as South Bridge. The network card chipset is a RTL8139D. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Aleksandar Markovic --- v3: Loongson 2E = CPU, Fulong 2E = machine (Aleksandar) --- default-configs/mips64el-softmmu.mak | 3 --- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 88b66a91d7..d0814e76af 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -1,9 +1,6 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y CONFIG_FULONG=y -CONFIG_PCI_BONITO=y CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 57e09a0cb8..30055aed82 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -32,10 +32,15 @@ config PIIX4 config VT82C686 bool - select ISA_BUS - select ACPI_SMBUS - select SERIAL_ISA - select FDC + select PCI + select I8259 + select I8254 + select I8257 + select PARALLEL + select IDE_ISA + select IDE_VIA + select USB_UHCI + #select PCKBD config SMC37C669 bool diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index bd6e3be2cd..b06d70bf01 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -43,6 +43,11 @@ config JAZZ config FULONG bool + select PCI_BONITO + select VT82C686 + select SMBUS_EEPROM + select RTL8139_PCI + select MC146818RTC config MIPS_CPS bool