From patchwork Sun Feb 3 22:07:39 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: 1035653 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 AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t4k85JQ6z9s3l for ; Mon, 4 Feb 2019 09:09:01 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPwd-0002F9-4I for incoming@patchwork.ozlabs.org; Sun, 03 Feb 2019 17:08:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPvh-0002Cb-Uy for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:07:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqPvh-0006wK-53 for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:07:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqPvg-0006vr-Va for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:07:57 -0500 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 3CD82C0587DA; Sun, 3 Feb 2019 22:07:56 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B59C67168; Sun, 3 Feb 2019 22:07:53 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 3 Feb 2019 23:07:39 +0100 Message-Id: <20190203220744.11734-2-philmd@redhat.com> In-Reply-To: <20190203220744.11734-1-philmd@redhat.com> References: <20190203220744.11734-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]); Sun, 03 Feb 2019 22:07:56 +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 1/6] 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- default-configs/mips-softmmu-common.mak | 2 -- hw/mips/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 0795d522db..aa73a4a822 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 @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_R4K=y CONFIG_MALTA=y -CONFIG_MIPSSIM=y CONFIG_ACPI_SMBUS=y CONFIG_SMBUS_EEPROM=y CONFIG_TEST_DEVICES=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 Sun Feb 3 22:07:40 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: 1035656 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 AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t4n61BJtz9s4V for ; Mon, 4 Feb 2019 09:11:37 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPzE-0004hM-0Q for incoming@patchwork.ozlabs.org; Sun, 03 Feb 2019 17:11:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPvl-0002FN-1i for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqPvk-0006xm-6Z for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58090) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqPvk-0006xG-0q for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:00 -0500 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 3ABF5811AC; Sun, 3 Feb 2019 22:07:59 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A524667179; Sun, 3 Feb 2019 22:07:56 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 3 Feb 2019 23:07:40 +0100 Message-Id: <20190203220744.11734-3-philmd@redhat.com> In-Reply-To: <20190203220744.11734-1-philmd@redhat.com> References: <20190203220744.11734-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]); Sun, 03 Feb 2019 22:07: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 2/6] 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-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é --- default-configs/mips-softmmu-common.mak | 1 - default-configs/mips64-softmmu.mak | 6 ------ default-configs/mips64el-softmmu.mak | 6 ------ hw/mips/Kconfig | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index aa73a4a822..a1681edec4 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..ea66ce0b72 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -1,9 +1,3 @@ # 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..23445cfcf9 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -2,13 +2,7 @@ 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 Sun Feb 3 22:07:41 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: 1035657 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 AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t4n90znvz9s4V for ; Mon, 4 Feb 2019 09:11:41 +1100 (AEDT) Received: from localhost ([127.0.0.1]:32768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPzH-0004kr-3W for incoming@patchwork.ozlabs.org; Sun, 03 Feb 2019 17:11:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPvo-0002Ie-Fr for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqPvn-0006zK-8j for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43944) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqPvn-0006yh-30 for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:03 -0500 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 3863299C4B; Sun, 3 Feb 2019 22:08:02 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F67D67173; Sun, 3 Feb 2019 22:07:59 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 3 Feb 2019 23:07:41 +0100 Message-Id: <20190203220744.11734-4-philmd@redhat.com> In-Reply-To: <20190203220744.11734-1-philmd@redhat.com> References: <20190203220744.11734-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.38]); Sun, 03 Feb 2019 22:08: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 3/6] 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-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é --- default-configs/mips-softmmu-common.mak | 1 - hw/mips/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index a1681edec4..aa3ca196b4 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -31,7 +31,6 @@ CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y -CONFIG_R4K=y CONFIG_MALTA=y CONFIG_ACPI_SMBUS=y CONFIG_SMBUS_EEPROM=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index ab006477c7..ee6290d497 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,5 +1,15 @@ 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 config MALTA bool From patchwork Sun Feb 3 22:07:42 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: 1035655 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 AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t4kG6ZN9z9s3l for ; Mon, 4 Feb 2019 09:09:10 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPwq-0002Re-RG for incoming@patchwork.ozlabs.org; Sun, 03 Feb 2019 17:09:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPvu-0002Mn-3J for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqPvt-00072S-Cv for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42278) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqPvt-000721-7A for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:09 -0500 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 6FDD981F10; Sun, 3 Feb 2019 22:08:08 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F30367177; Sun, 3 Feb 2019 22:08:02 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 3 Feb 2019 23:07:42 +0100 Message-Id: <20190203220744.11734-5-philmd@redhat.com> In-Reply-To: <20190203220744.11734-1-philmd@redhat.com> References: <20190203220744.11734-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.25]); Sun, 03 Feb 2019 22:08: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 4/6] 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-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. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips64el-softmmu.mak | 5 ----- hw/mips/Kconfig | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index 23445cfcf9..ac44df1d0d 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -4,8 +4,3 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=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 ee6290d497..2940ff39ab 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -49,3 +49,8 @@ config MIPS_CPS config MIPS_BOSTON bool + select FITLOADER + select MIPS_CPS + select PCI_EXPRESS_XILINX + select AHCI + select SERIAL From patchwork Sun Feb 3 22:07:43 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: 1035658 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 AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t4r315nhz9sDr for ; Mon, 4 Feb 2019 09:14:08 +1100 (AEDT) Received: from localhost ([127.0.0.1]:32792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqQ1d-0006Mc-JI for incoming@patchwork.ozlabs.org; Sun, 03 Feb 2019 17:14:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPw0-0002Rc-O8 for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqPvz-000769-Se for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqPvz-00075a-Mk for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:15 -0500 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 D589AC049DC1; Sun, 3 Feb 2019 22:08:14 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE2FB67147; Sun, 3 Feb 2019 22:08:08 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 3 Feb 2019 23:07:43 +0100 Message-Id: <20190203220744.11734-6-philmd@redhat.com> In-Reply-To: <20190203220744.11734-1-philmd@redhat.com> References: <20190203220744.11734-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.31]); Sun, 03 Feb 2019 22:08: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 5/6] 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-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. Select it for the Loongson 2E machine. Signed-off-by: Philippe Mathieu-Daudé --- 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 ac44df1d0d..ee583758e1 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -3,4 +3,5 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=y +CONFIG_PCI_BONITO=y CONFIG_VT82C686=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 Sun Feb 3 22:07:44 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: 1035659 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 AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43t4r315mNz9sDX for ; Mon, 4 Feb 2019 09:14:08 +1100 (AEDT) Received: from localhost ([127.0.0.1]:32790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqQ1a-0006L9-Db for incoming@patchwork.ozlabs.org; Sun, 03 Feb 2019 17:14:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqPwN-0002j1-Hi for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqPwK-0007Fo-5h for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60992) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqPw9-00077r-FW for qemu-devel@nongnu.org; Sun, 03 Feb 2019 17:08:29 -0500 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 D69EAC04FFED; Sun, 3 Feb 2019 22:08:17 +0000 (UTC) Received: from x1w.redhat.com (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 487A967147; Sun, 3 Feb 2019 22:08:15 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sun, 3 Feb 2019 23:07:44 +0100 Message-Id: <20190203220744.11734-7-philmd@redhat.com> In-Reply-To: <20190203220744.11734-1-philmd@redhat.com> References: <20190203220744.11734-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.31]); Sun, 03 Feb 2019 22:08: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 6/6] mips: Express dependencies of the Loongson 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 , Thomas Huth , Aleksandar Rikalo , James Hogan , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Loongson 2E uses 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é --- default-configs/mips64el-softmmu.mak | 4 ---- hw/isa/Kconfig | 13 +++++++++---- hw/mips/Kconfig | 5 +++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index ee583758e1..aa4f0d1a44 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -1,7 +1,3 @@ # Default configuration for mips64el-softmmu include mips-softmmu-common.mak -CONFIG_IDE_VIA=y -CONFIG_FULONG=y -CONFIG_PCI_BONITO=y -CONFIG_VT82C686=y diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index d580471c00..bd6f60dd3d 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -33,10 +33,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 2940ff39ab..16b2bdb068 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -42,6 +42,11 @@ config JAZZ config FULONG bool + select PCI_BONITO + select VT82C686 + select SMBUS_EEPROM + select RTL8139_PCI + select MC146818RTC config MIPS_CPS bool