From patchwork Mon Jan 9 20:41:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13094253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58726C5479D for ; Mon, 9 Jan 2023 20:43:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEyyc-0006li-V5; Mon, 09 Jan 2023 15:42:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEyyY-0006l5-8Y for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:34 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEyyW-0002tJ-Mp for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:34 -0500 Received: by mail-ed1-x536.google.com with SMTP id i15so14441563edf.2 for ; Mon, 09 Jan 2023 12:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iqrzbqkehjMiObCYabTBJTHd54TXr5OaZJNbLN173bg=; b=lrnQ9l6Gr/IM6zE6pepuTH6hf0iDgZpNYobVBDPHOa6ZfDaygOUA0gtYDRwfcb2Cog 6mobI3UdkfjW+hSwVJXADobzbhpz1EkDR6CjUMWyK7QmCFqedE3JfG4Fg7P3MQQ8y8eG L4Vka0KzSKq518WHY2kPby9STh5NENhnAegdztKbq4iuPVYpvSkK1Z1hceqU8opyQIj5 IUHvusTJbLw/Z+48wT8ZYg9aZJoGdak8RDNMREs5uEukXKKVWM9i2JNIeW2HpHSSHqTy Gm2nRuoy3K5Wn2AFs0qJv17U+mG04EXpVvPnC2xvezLjeJsZd46HhTF08hzfJe75MQZv w0JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iqrzbqkehjMiObCYabTBJTHd54TXr5OaZJNbLN173bg=; b=K7vudpFFdbxggJ2a3lGkX1tHU/6i+a7A2T1wx62APfUmjLMiPqm69UvgOuTAigZlt9 vW0t80nb6wYJwwFOcmpKpH12NG7DMNHGjuAM71yos/zD8UBs5bxm8h79zA/aJB4ZwU6v SyTOrPYxNKrHyMfG7ml8C9yY6rfbPLR+paZXDQR1QJ3EJGpR/GJeOQ+6GDfRXLguxAPq sSjMx+rw+J6A8JPlBDiFLD4YYboQby7p0Remb95Epgjd2uL9H+yuxS6N1jxtEaWgCaUB n41ZY8g8YhQEthNfEcZUJA6be8Gdd1XecPVGsWdF27u+78jcPiP50WDYeggdgAdCFSNS I39Q== X-Gm-Message-State: AFqh2krnODwN2qFpPS+xyz6MEEMU0V4PAYwBV6UAuoXO1EyGCFxspjzC Xt8dUlCC034OOs7GY8JxlPqNTP7Lqms= X-Google-Smtp-Source: AMrXdXumdyg/IO2pxa8g2xgkr6gYMN/TMEb5vI7d1bzraIq4XF6M3trWiB755mzf+4sJmMx7f1FPCg== X-Received: by 2002:aa7:d984:0:b0:496:9d0f:3081 with SMTP id u4-20020aa7d984000000b004969d0f3081mr10838973eds.3.1673296950736; Mon, 09 Jan 2023 12:42:30 -0800 (PST) Received: from localhost.localdomain (ip-185-104-138-30.ptr.icomera.net. [185.104.138.30]) by smtp.gmail.com with ESMTPSA id ca20-20020aa7cd74000000b0046267f8150csm4078018edb.19.2023.01.09.12.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 12:42:30 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Bernhard Beschow Subject: [PATCH 1/4] hw/isa/Kconfig: Add missing PARALLEL dependency to ISA_SUPERIO Date: Mon, 9 Jan 2023 21:41:21 +0100 Message-Id: <20230109204124.102592-2-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109204124.102592-1-shentey@gmail.com> References: <20230109204124.102592-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org isa-superio.c, managed by ISA_SUPERIO, instantiates TYPE_ISA_PARALLEL, managed by PARALLEL. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/isa/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 040a18c070..58137f2702 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -16,6 +16,7 @@ config I82378 config ISA_SUPERIO bool select ISA_BUS + select PARALLEL select PCKBD select FDC_ISA From patchwork Mon Jan 9 20:41:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13094251 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80FE6C5479D for ; Mon, 9 Jan 2023 20:43:09 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEyyh-0006mO-1B; Mon, 09 Jan 2023 15:42:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEyyZ-0006lW-T1 for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:35 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEyyY-0002tm-CF for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:35 -0500 Received: by mail-ed1-x532.google.com with SMTP id c34so14494435edf.0 for ; Mon, 09 Jan 2023 12:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=c5HEvWC8yzZ3rlkRH0wedpeFM4/qVAvcqPXLMVH7T5Q=; b=A4ApPJucQbYn+YK5CYTbXoEDeUDJxK9Ts/+HyoOHks9gvuoYvsnclOB76NVCobqeAc jRUEWZKMMAaMZTHJoVbL6VXFKcvMRaqh0dm5BTKCMl9lyt+78EWA2PQDhBFmszULdsof h8b6HL87vYS4naYOdSU+HMMfrSdX9c/BUvvAUOaRy/spjc6HpY6iaoYfvQyLMxQcIPqj jvnA2BrHEHnjlJSUyebIVZds+pQgHQCRlp95cgoMh0wrJCYcTQgtOBC7OtOiUhnwPElD kg1Gc72yeo/R06WlQb3TkUhJNNohR4AkENbPSQdEPs9xnexAgZnJSit7Je+UGfPCOvWM pxcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c5HEvWC8yzZ3rlkRH0wedpeFM4/qVAvcqPXLMVH7T5Q=; b=n/13R5cwdPVGsJRSsWvDNh1Plu1GXdaAjWupSgE5nMkTtnwK+VqquzxWED5NJrgtcu W92XVY8e6+Nriu3+uQvRsV2saO7/lyCtaQNpNWtPgMw1TGM/PTil1pdqv/EXnY+4Ii8F wA1MEVePW/M2FyloZZRByw4XVnM4847yBJDfmeBAevID3UHLUZBgTqvi0vjVSLAq7GDf nvs2V+JJKdCblEfSq71JioTOi5HiWFF30xpd+qf60OjgTstwLUk59pBGSvatBsHRRaFV ffq17SZ4bUqRh2h37YDL0O6KgJwQ676prWd1Lv769v43ILZscPN8ROWjfPlh6pvPn/AH 2rUg== X-Gm-Message-State: AFqh2kpVs/TywuaVcfSboRnJ+MSPXVISl8GAH/wAPrVzbqngt0YynBTP PIihcm5rslgek3cN71YsXZj1QDs+P6w= X-Google-Smtp-Source: AMrXdXtnb61yrcD+p7Kx6JGMBaWp9RRLZfTj0eB20PxYIi67ZQQ6kbLWkbxOCCa2MVdVRO8okc0qJw== X-Received: by 2002:a05:6402:448a:b0:481:9219:f603 with SMTP id er10-20020a056402448a00b004819219f603mr50683329edb.28.1673296952064; Mon, 09 Jan 2023 12:42:32 -0800 (PST) Received: from localhost.localdomain (ip-185-104-138-30.ptr.icomera.net. [185.104.138.30]) by smtp.gmail.com with ESMTPSA id ca20-20020aa7cd74000000b0046267f8150csm4078018edb.19.2023.01.09.12.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 12:42:31 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Bernhard Beschow Subject: [PATCH 2/4] hw/mips/Kconfig: Remove ISA dependencies from MIPSsim board Date: Mon, 9 Jan 2023 21:41:22 +0100 Message-Id: <20230109204124.102592-3-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109204124.102592-1-shentey@gmail.com> References: <20230109204124.102592-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=shentey@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The board doesn't seem to have an ISA bus at all. Signed-off-by: Bernhard Beschow --- hw/mips/mipssim.c | 1 - hw/mips/Kconfig | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index 39f64448f2..f459550c13 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -32,7 +32,6 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/char/serial.h" -#include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 5b16ff4ed2..78400f8c23 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -6,8 +6,7 @@ config MALTA config MIPSSIM bool - select ISA_BUS - select SERIAL_ISA + select SERIAL select MIPSNET config JAZZ From patchwork Mon Jan 9 20:41:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13094254 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0561C5479D for ; Mon, 9 Jan 2023 20:43:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEyyj-0006mc-Gh; Mon, 09 Jan 2023 15:42:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEyya-0006lm-TL for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:37 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEyyY-0002u3-Sl for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:36 -0500 Received: by mail-ed1-x536.google.com with SMTP id x10so11519119edd.10 for ; Mon, 09 Jan 2023 12:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5yAJo9cGPp1zqG3klMq3hhG+PJdL4i7lidfguILtK8M=; b=UbzVGI0cwb2qlyiLeSMNrH4TsZCo9oqUNCH7ctwXwUJ+uu3D2PM7LRQRPbF561BWGs yNXVrAeXr0cyUsXYGRpARut4Wmmasq1oU63rRwrqTKTtx0Qq2Z15b6PGd9KjKkHp0w9a /+wudPw+sRQkTIg8Lz/DhlJSzqMUp4BRiafuUDNH4qyQ4IXhuDZbIvHSD6RpHpPLTwmC aAo5m4Y26EVsiJb02zqAluNnRvPN4lj91dKY7iegTfT7iLjaP8ibMpGWsT/SmGQSLEnm aGhf47Q1m/qYpPickRlWJsHr7vlV2yg9uHgQV2Zj1TR7UtlvqohjEu8YuMoI8KZIM1np y9aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5yAJo9cGPp1zqG3klMq3hhG+PJdL4i7lidfguILtK8M=; b=zSgbwQ6xFdK83RJqPjK6YzgkTDjHDXjf2IitLvekng5yTm1mgpTyptA8nTEwQsfBHP aWefgIY+ty7z/3q0l9jY+v5/dOiTcGgjt7DucbTUkdmsHTMROuYLazM+98pqEajv7PRu wIvdxQT2l9Ra6bb7u2f8s79trLHCzKAQHmWPMV5bxkwZERNpL8MfdrCD7I+mBAOIjPyD /TNhNwlH+0anGhgba6uAwLIDeLdaAAj121WgW/1rNn8pVuchmB/Bdb1psgf+lQsqx5Pq NM7tbCKD0Y8OSRvy9xmcd81RMRlCKKuy303+Yr4oOpkDpCbl6jKp5mHL14Gzl7HD2hR2 3hGA== X-Gm-Message-State: AFqh2krGyWESsV7jBqM0tQ6EWi8bN0msRlyUYWouBa1JkXTKs/vWrdpC dkz1/1ILC0v/AjADvCI8K4XusUx0ECM= X-Google-Smtp-Source: AMrXdXs4nd0KHyx2SwT+0wbTjkc3wIl6t9a+xyFpvt41CRimniQS+fLBDAaoQzzhSAVtb+ElLjcliA== X-Received: by 2002:a05:6402:299b:b0:499:70a8:f91a with SMTP id eq27-20020a056402299b00b0049970a8f91amr5609249edb.19.1673296953286; Mon, 09 Jan 2023 12:42:33 -0800 (PST) Received: from localhost.localdomain (ip-185-104-138-30.ptr.icomera.net. [185.104.138.30]) by smtp.gmail.com with ESMTPSA id ca20-20020aa7cd74000000b0046267f8150csm4078018edb.19.2023.01.09.12.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 12:42:32 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Bernhard Beschow Subject: [PATCH 3/4] configs/devices/mips-softmmu/common: Remove redundant selections of SuperIO and ISA devices Date: Mon, 9 Jan 2023 21:41:23 +0100 Message-Id: <20230109204124.102592-4-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109204124.102592-1-shentey@gmail.com> References: <20230109204124.102592-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org These devices should now be selected by their respective boards or parent devices. Signed-off-by: Bernhard Beschow --- configs/devices/mips-softmmu/common.mak | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 8ed6b62ae7..d1cfe16b81 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -11,17 +11,8 @@ CONFIG_VGA_MMIO=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y CONFIG_SERIAL=y -CONFIG_SERIAL_ISA=y -CONFIG_PARALLEL=y -CONFIG_I8254=y -CONFIG_PCSPK=y -CONFIG_PCKBD=y -CONFIG_FDC=y -CONFIG_I8257=y -CONFIG_IDE_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y -CONFIG_MC146818RTC=y CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y From patchwork Mon Jan 9 20:41:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13094252 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3985BC54EBD for ; Mon, 9 Jan 2023 20:43:19 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEyyl-0006po-GP; Mon, 09 Jan 2023 15:42:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pEyyb-0006ln-M8 for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:37 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEyya-0002ug-5v for qemu-devel@nongnu.org; Mon, 09 Jan 2023 15:42:37 -0500 Received: by mail-ed1-x52c.google.com with SMTP id i9so14441604edj.4 for ; Mon, 09 Jan 2023 12:42:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+vQGjzzE/CoQGB/cMKXGEyC0JB45XYFEg3Frz9/9KeA=; b=LxeU3+VlURFV7LhvgwXwPleDT7kC1hnyGde0ho2Z+FISDz1m2eqBSx4LUlorGhjd4e 6QUDY3J+h8GX/k2V7oX0XJlUHXNSceTZqF4fi801tsjA7LO/Bme05XgiO/gtXK91/DPp d3GNcSYbYGPBx05zKUpnDWLkTmooMO0VrMiC9Lk0kh8EWOWROkbXfsUjCIfSuPq0idx5 L2RYZp5XD3neb4oG3AUBkG7z1H9Qu/sNmtBO5WwUwIGb0yQDR0Pmn1rqDF5LcJN3VVnr VRTgDi1ymeE4A62gCtFAud0uXoeFKuSZKEV4pYUw6qC0xbN+UG1vV4EBIiYtCtSFVC85 XATw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+vQGjzzE/CoQGB/cMKXGEyC0JB45XYFEg3Frz9/9KeA=; b=tSIZffPapEv33EpTOfY1ToWu+p9EbNXuXkEZUIKgX1tO5rc2e+vCeN3xa8VDVdcMwJ agWjyhvhkOd/kb0P24XMCAWWAkYAjsM8SU2ORiLXpWYL+/yGbklRYnzx5vvmxnFy5JJG b3S+PhufF6KcfkYnHOlSKVyjfwvGInSnS9vUYa7a3IClWPxd7e9KEJMDF+kwa3ww7XVk DfbXP7sJ7TOp71AbT5PA6CF54uZe5v7lXaS1p1R91vCnbhxLhUKa6LTB15EyqSiVi70U 6xFECQGwRfAYIp+AlNVl8MttIhlgmjKKrw9SgfCgwYyBhkjMIMgGbmqkXmHjJ6P3lldA tdDQ== X-Gm-Message-State: AFqh2kr98I25Xuu8jvsPK0nREULbgFF8iIa9fQOaUDRfm10SPqHWgJp6 YRjoMZdMec9QpP+ymntZF5dDKXgwiJQ= X-Google-Smtp-Source: AMrXdXtk7os9d0BXMP0hedZaugN96cSMRUXw3tiT3jDANDi+cVoen78ZsEEEiK7EKSp/O0kqaTKHJw== X-Received: by 2002:aa7:d61a:0:b0:499:376e:6b2d with SMTP id c26-20020aa7d61a000000b00499376e6b2dmr7889372edr.0.1673296954653; Mon, 09 Jan 2023 12:42:34 -0800 (PST) Received: from localhost.localdomain (ip-185-104-138-30.ptr.icomera.net. [185.104.138.30]) by smtp.gmail.com with ESMTPSA id ca20-20020aa7cd74000000b0046267f8150csm4078018edb.19.2023.01.09.12.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 12:42:34 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Jiaxun Yang , Bernhard Beschow Subject: [PATCH 4/4] hw/mips/Kconfig: Move device selections to respective boards Date: Mon, 9 Jan 2023 21:41:24 +0100 Message-Id: <20230109204124.102592-5-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230109204124.102592-1-shentey@gmail.com> References: <20230109204124.102592-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allows to see more easily which board has which devices. Signed-off-by: Bernhard Beschow --- configs/devices/mips-softmmu/common.mak | 7 ------- configs/devices/mips64el-softmmu/default.mak | 3 --- hw/mips/Kconfig | 12 ++++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index d1cfe16b81..4e535e2246 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -7,17 +7,10 @@ CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y CONFIG_VGA_ISA=y -CONFIG_VGA_MMIO=y CONFIG_VGA_CIRRUS=y CONFIG_VMWARE_VGA=y -CONFIG_SERIAL=y -CONFIG_PFLASH_CFI01=y -CONFIG_I8259=y -CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_MALTA=y -CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y -CONFIG_SMBUS_EEPROM=y CONFIG_TEST_DEVICES=y diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices/mips64el-softmmu/default.mak index d5188f7ea5..88a37cf27f 100644 --- a/configs/devices/mips64el-softmmu/default.mak +++ b/configs/devices/mips64el-softmmu/default.mak @@ -3,8 +3,5 @@ include ../mips-softmmu/common.mak CONFIG_FULOONG=y CONFIG_LOONGSON3V=y -CONFIG_ATI_VGA=y -CONFIG_RTL8139_PCI=y CONFIG_JAZZ=y -CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index 78400f8c23..67d2859be4 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,8 +1,14 @@ config MALTA bool + select EMPTY_SLOT select I8259 select ISA_SUPERIO + select MIPS_CPS + select PCNET_PCI + select PFLASH_CFI01 select PIIX + select SERIAL + select SMBUS_EEPROM config MIPSSIM bool @@ -28,10 +34,15 @@ config JAZZ select PARALLEL select DS1225Y select JAZZ_LED + select VGA_MMIO config FULOONG bool + select ATI_VGA select PCI_BONITO + select RTL8139_PCI + select SMBUS_EEPROM + select VT82C686 config LOONGSON3V bool @@ -39,6 +50,7 @@ config LOONGSON3V imply QXL if SPICE select SERIAL select GOLDFISH_RTC + select I8259 select LOONGSON_LIOINTC select PCI_DEVICES select PCI_EXPRESS_GENERIC_BRIDGE