From nobody Sun Oct 5 01:46:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551729219656152.21384036322922; Mon, 4 Mar 2019 11:53:39 -0800 (PST) Received: from localhost ([127.0.0.1]:59993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0teX-0004hq-Da for importer@patchew.org; Mon, 04 Mar 2019 14:53:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCn-0002Af-Pa for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCl-0004TZ-6n for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:48 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43861) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCi-0004NC-9k for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id d17so6637515wre.10 for ; Mon, 04 Mar 2019 10:20:43 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+3VzXtjhEDlHF1KqE0GGRgSgdOL3/2eWelfK1vTqWlo=; b=BwsOTMu6xXTr5ouFkfaFyb+d23RxrzMXQXSRiQ8XJQ+G74gh1r4cnW5G0PsgkLT15w gd/7ksY50PXcWeGRilgVGZBex8P9hz3wAdtDhC+zgDRaQ1eoURwuUzpGxkvE8oJjDjiF y18SkGdENeuQumYG9eO3stWRUJ89xzIpSzfJWHcc8NheNp7tR4U0lhfgY0YydyxTpIm0 QRLJBtocpbtffkPH5LeTJQ3OGzyGOZ3BRJomo8Yj2JLJX3sFOz73Y+yRrUKXJS0vvUPM 3gmHQZJ7izBsv1khBwQtnYgjv7usmpPrB31reACHfQgsCVDjmLhCoQJOA2qoYs1PgHwT mbTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+3VzXtjhEDlHF1KqE0GGRgSgdOL3/2eWelfK1vTqWlo=; b=oBkjHICqz+lhsNOubaeQOB1RM2Ms2o16taGYRy2bsx/Qc+1elYMqvnD0WpfjTmxYyr qMqNaSCw3qxnUDzVAa9rPjIcf2FCbBU2FgB+1/h8PB7GHBpdHJWbUsrA1sxYQXHVNIuR Rvrd4MearglPqyi8Lwn5a0Yd0xRUupp5gW5rjy72dwc9udXEByWmqNJoqqGNppJ3lEQt f33nprQoYRWmp3QghAEV6Uupae+ztcW2a+cuSH5GUH6UtIJgiYfXpMR05o4XlysG61YG UfK4Z3p0W4rtN/cHauKX723trBlutzFDvqFtZn88STkItVnK13h/Rj0UoQPNQwOpx79C Juyg== X-Gm-Message-State: APjAAAUOw2OEAdqq59+zdgiTuwlhyWl2p+hJdpK195L7HB93S+wTKIqR inhIwDrGMwf633dJ3Ttk15vUgiCa X-Google-Smtp-Source: APXvYqwyv2DarkrdBTK2Z7YBMemwbvOzHMjbZJ2cI1Ey2BJNlkP2EAPh7Z32OOl03D1KYoWCjgtAeQ== X-Received: by 2002:a05:6000:1142:: with SMTP id d2mr13266791wrx.43.1551723642437; Mon, 04 Mar 2019 10:20:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:47 +0100 Message-Id: <1551723614-1823-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 27/54] isa: express SuperIO dependencies 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 , thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 5 ----- default-configs/ppc-softmmu.mak | 9 --------- default-configs/sh4-softmmu.mak | 9 ++------- default-configs/sh4eb-softmmu.mak | 6 ------ hw/block/Kconfig | 5 +++-- hw/isa/Kconfig | 21 +++++++++++++++++++++ 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index f0c1928..762e3a2 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -2,13 +2,8 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_I82374=3Dy CONFIG_I8254=3Dy -CONFIG_I8257=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_FDC=3Dy CONFIG_PCKBD=3Dy CONFIG_VGA_CIRRUS=3Dy CONFIG_VMWARE_VGA=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index d1ee6f7..9ad307a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -9,12 +9,10 @@ CONFIG_TEST_DEVICES=3Dy CONFIG_PPC4XX=3Dy CONFIG_M48T59=3Dy CONFIG_SERIAL=3Dy -CONFIG_I8257=3Dy CONFIG_OPENPIC=3Dy CONFIG_PPCE500_PCI=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_PFLASH_CFI02=3Dy -CONFIG_I8259=3Dy CONFIG_XILINX=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_E500=3Dy @@ -58,17 +56,10 @@ CONFIG_MAC_NEWWORLD=3Dy # For PReP CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_RS6000_MC=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy CONFIG_I82378=3Dy -CONFIG_I8254=3Dy CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_NE2000_ISA=3Dy CONFIG_PC87312=3Dy -CONFIG_PCSPK=3Dy -CONFIG_IDE_ISA=3Dy CONFIG_CS4231A=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index ccefc10..4ba5584 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,20 +1,15 @@ -# Default configuration for sh4-softmmu +# Default configuration for sh4eb-softmmu =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index c8edeb7..9717673 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -3,18 +3,12 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy CONFIG_PFLASH_CFI02=3Dy CONFIG_SH4=3Dy CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy -CONFIG_I8259=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy CONFIG_I82374=3Dy -CONFIG_I8257=3Dy -CONFIG_MC146818RTC=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy diff --git a/hw/block/Kconfig b/hw/block/Kconfig index f89e4eb..55e1a1e 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,7 +1,8 @@ config FDC bool - default y - depends on ISA_BUS + # FIXME: there is no separate file for the MMIO floppy disk controller= , so + # select ISA_BUS here instead of polluting each board that requires one + select ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index fcd87b4..57e09a0 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -7,26 +7,47 @@ config APM config I82378 bool select ISA_BUS + select I8259 + select I8254 + select I82374 + select MC146818RTC =20 config PC87312 bool select ISA_BUS + select I8259 + select I8254 + select I8257 + select MC146818RTC + select SERIAL_ISA + select PARALLEL + select FDC + select IDE_ISA =20 config PIIX4 bool + # For historical reasons, SuperIO devices are created in the board + # for PIIX4. select ISA_BUS =20 config VT82C686 bool select ISA_BUS select ACPI_SMBUS + select SERIAL_ISA + select FDC =20 config SMC37C669 bool select ISA_BUS + select SERIAL_ISA + select PARALLEL + select FDC =20 config LPC_ICH9 bool + # For historical reasons, SuperIO devices are created in the board + # for ICH9. select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH --=20 1.8.3.1