From patchwork Tue Feb 27 23:26:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1905502 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Sk6VoUnU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TkttD6Ds5z23d3 for ; Wed, 28 Feb 2024 10:26:59 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rf6q0-0002AC-Rj; Tue, 27 Feb 2024 18:26:16 -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 1rf6q0-0002A2-2Y for qemu-devel@nongnu.org; Tue, 27 Feb 2024 18:26:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf6pw-0002kR-UX for qemu-devel@nongnu.org; Tue, 27 Feb 2024 18:26:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709076371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Igx5r/1+mLXyO9KYz2bzrP9NwD2WD/t56myINSWYNeQ=; b=Sk6VoUnUHXJGHtigHAMKbwS9tYBRWQx0udtbhDEgr49eKqlYfJQR2bKD2NtrZSvE3ITqnR fBHY/pGPGf2idUQ6kSZE2z1JiT3WeWH4EibtO4PzKEDd+4uTcQg6g6UW4/cAtselHm0ZGT 9mJUqjshliY9c0mal1mGaibHStovuKw= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-bNLYv12IO0qglxM1xEVQFA-1; Tue, 27 Feb 2024 18:26:08 -0500 X-MC-Unique: bNLYv12IO0qglxM1xEVQFA-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-5116e86c080so3842232e87.3 for ; Tue, 27 Feb 2024 15:26:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709076365; x=1709681165; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Igx5r/1+mLXyO9KYz2bzrP9NwD2WD/t56myINSWYNeQ=; b=wR7r5oGCvN+15zSOS9ktm5LxhdCGOAx/N905U4kWSDeBYBmpaAybiCzGDe8EiKUf8p xT88ElOdmMlGKo3NJB0kiLw6EigNgHXDZj2OP4J0jp3tJxWnY/12dcxLdYRI7UMi8iSF sw2aOL2MRPxi1qWHtRn7eaPdqIJdywiV5cqbKYf7Agp+2c9fTZfqQ+s/h1tkRLxBoYAw yQizxZ65XRk2oDY+mIaYPEofjz1XzO8YZ3ECTy6odn/MxDF++CNk3J40sYMgym9XOBz+ 3hvmmpYaE27lcTdy19+cZXxK4YcdQxkCkruUtmqt2UGJBmL71kGpn97rK9fDFLUuxj99 iqgA== X-Gm-Message-State: AOJu0YxHSZD/68Q16fs/s6DA9lWoeBCYVEmhD6QnHzMShf7LYxFCv8JJ 8gYSJskGWCJmllHS2R7gPZwuBwALP+Q1xln+QB40ri0YGm60+41XN8kQg+RP6eSl8sQNqcvCKcl MD7xpmgFKWkz/8D6qd4xqRc2Y+t2MmV6tCqHS1mDYhrzFjhNWfxnwSsmkTovJ8K2c47FxpMacAw UN5dHx5fw0CTbEJDtlHutR1h6dtnT+meaYKWEY X-Received: by 2002:a05:6512:2309:b0:513:b8:fd51 with SMTP id o9-20020a056512230900b0051300b8fd51mr5058917lfu.45.1709076365292; Tue, 27 Feb 2024 15:26:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFb9BdbdgwS/ErAzq8RdU4Rb5tjtTlfEkkaqfkBruCzFE/VUPjoiUmMlFA+MNNQ9DVAqXXtMQ== X-Received: by 2002:a05:6512:2309:b0:513:b8:fd51 with SMTP id o9-20020a056512230900b0051300b8fd51mr5058909lfu.45.1709076364836; Tue, 27 Feb 2024 15:26:04 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j20-20020a1709066dd400b00a3d665c6778sm1242800ejt.12.2024.02.27.15.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 15:26:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH] mips: do not list individual devices from configs/ Date: Wed, 28 Feb 2024 00:26:03 +0100 Message-ID: <20240227232603.240365-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add new "select" and "imply" directives if needed. The resulting config-devices.mak files are the same as before. Note that builds without default devices will become much smaller than before; for this reason, it's necessary to use only the bare minimum of USB functions, in particular only those that are inlined. For this reason, usb_bus_find() must be removed, as it only exists if CONFIG_USB is selected by a host controller. Signed-off-by: Paolo Bonzini --- configs/devices/mips-softmmu/common.mak | 28 +++----------------- configs/devices/mips64el-softmmu/default.mak | 3 --- .gitlab-ci.d/buildtest.yml | 2 +- hw/display/Kconfig | 2 +- hw/mips/Kconfig | 20 +++++++++++++- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 1a853841b27..416a5d353e8 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -1,28 +1,8 @@ # Common mips*-softmmu CONFIG defines -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_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_MIPS_CPS=y -CONFIG_MIPS_ITU=y +# Uncomment the following lines to disable these optional devices: +# CONFIG_PCI_DEVICES=n +# CONFIG_TEST_DEVICES=n + 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 d5188f7ea58..88a37cf27f1 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/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a1c030337b1..901265af95d 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -659,7 +659,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu + TARGETS: avr-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 07acb37dc66..234c7de027c 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -55,7 +55,7 @@ config VGA_MMIO config VMWARE_VGA bool - default y if PCI_DEVICES && PC_PCI + default y if PCI_DEVICES && (PC_PCI || MIPS) depends on PCI select VGA diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index e57db4f6412..5c83ef49cf6 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,8 +1,15 @@ config MALTA bool + imply PCNET_PCI + imply PCI_DEVICES + imply TEST_DEVICES select FDC37M81X select GT64120 + select MIPS_CPS select PIIX + select PFLASH_CFI01 + select SERIAL + select SMBUS_EEPROM config MIPSSIM bool @@ -31,17 +38,26 @@ config JAZZ config FULOONG bool + imply PCI_DEVICES + imply TEST_DEVICES + imply ATI_VGA + imply RTL8139_PCI select PCI_BONITO + select SMBUS_EEPROM select VT82C686 config LOONGSON3V bool + imply PCI_DEVICES + imply TEST_DEVICES + imply VIRTIO_PCI + imply VIRTIO_NET imply VIRTIO_VGA imply QXL if SPICE + imply USB_OHCI_PCI select SERIAL select GOLDFISH_RTC select LOONGSON_LIOINTC - select PCI_DEVICES select PCI_EXPRESS_GENERIC_BRIDGE select MSI_NONBROKEN select FW_CFG_MIPS @@ -53,6 +69,8 @@ config MIPS_CPS config MIPS_BOSTON bool + imply PCI_DEVICES + imply TEST_DEVICES select FITLOADER select MIPS_CPS select PCI_EXPRESS_XILINX