From nobody Fri Dec 19 07:47:16 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549563506630621.4942966840606; Thu, 7 Feb 2019 10:18:26 -0800 (PST) Received: from localhost ([127.0.0.1]:44731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groFg-0001L2-HV for importer@patchew.org; Thu, 07 Feb 2019 13:18:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvw-0001xj-Tb for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvv-0002Hl-2h for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:56 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvu-0002HS-P8 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: by mail-wr1-x442.google.com with SMTP id v13so829100wrw.5 for ; Thu, 07 Feb 2019 09:57:54 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:52 -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=LrFNCqwnbEuLS4d3ll24MyMzEIBdwUAuozh8j57i2Rs=; b=Pirl9yf3nXzjnXrcnPxLjujHcTXxvMICKflAuXaNsOUzAaptDSEw76R+rrRMPLaWbT wL+ayvkA2o7CMP+D1kiehMGItYvHCCBMURtpz1PAZe6HbfSTz9Xk/LGBssRNY4bRCIWE jDMnD7RTXuJAeQ6Lkb7a6raBp8YTuRn082A8T4wjPY994wW9HJAtOwwwUYDdG8ip+Iew ORaLxR4mjcycassuSNSblef2yNFp5/XbM7FerRXuo8LZCcyyd7cvuBr3+E1xLSoB9t8Q yz4RLNO3Yo4iMmzXaDVDHQE6DHsFCN1FmEo0lMUDwl1qf8nd5DBiKYNdbcFEw7oH1IKB NUQA== 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=LrFNCqwnbEuLS4d3ll24MyMzEIBdwUAuozh8j57i2Rs=; b=mu8Kljb5NPsUHE/QVBuCV0bZ2ssk/OlITqYMOSwfBzm+wg71e14/uxaByQ+AlqsE8e 3pGqO2YmezjBJqQBaTYlEMykm5dQkCPl/Unfd+pl53S8W+EVydFd8avtM/yIG44Ii4PU tXCYfaaVUuy+RUMWBTdfTVKAkgHaRGUa6Aw8S/QDlBu4oQzrrJI/dDUAJPxvluDESyBG QySn91xDaGU+nUguONmu2pJIKBs3aajLa1HbHjW47CpwkpKQ/O+MR2BiAJa00WcTYNlh Z0QpY3sPQH7Ma3ZSoLdtGnogu4p1fNEfVnIT43GmppJiHm753n/mxXp4vyIkLlNFQ6HE u6Kg== X-Gm-Message-State: AHQUAubzaF6VXALxReYF0cYYsdh7c1DEMKBq59clWbYNEPPbkPo98mjX NReBzVjYCEepKtKGocdYjQRMo20t X-Google-Smtp-Source: AHgI3Ibh9t6k9/CQwRcIhWUoX8f/BfOmurrmsyf77hUwbvqG7Zc4Krcjjeodhj6i4H08JFKkHpBBsQ== X-Received: by 2002:adf:a78a:: with SMTP id j10mr13473011wrc.191.1549562273299; Thu, 07 Feb 2019 09:57:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:59 +0100 Message-Id: <1549562254-41157-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-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::442 Subject: [Qemu-devel] [PATCH 16/51] isa: express 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, philmd@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 Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 9 --------- default-configs/mips-softmmu-common.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - hw/audio/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 6 ++++++ hw/display/Kconfig | 3 +++ hw/dma/Kconfig | 1 + hw/i386/Kconfig | 1 + hw/ide/Kconfig | 1 + hw/input/Kconfig | 2 ++ hw/ipmi/Kconfig | 2 ++ hw/isa/Kconfig | 7 +++++++ hw/misc/Kconfig | 6 ++++++ hw/net/Kconfig | 4 ++++ hw/sparc64/Kconfig | 1 + hw/tpm/Kconfig | 2 +- hw/watchdog/Kconfig | 2 ++ 22 files changed, 41 insertions(+), 16 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index e1017aa..f0c1928 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -15,7 +15,6 @@ CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 60356ed..54b571f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -9,19 +9,12 @@ CONFIG_VGA_ISA=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_VMMOUSE=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_ACPI=3Dy CONFIG_ACPI_X86=3Dy CONFIG_ACPI_X86_ICH=3Dy @@ -31,14 +24,12 @@ CONFIG_APM=3Dy CONFIG_I8257=3Dy CONFIG_IDE_ISA=3Dy CONFIG_IDE_PIIX=3Dy -CONFIG_NE2000_ISA=3Dy CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy -CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index a7a8d4e..45c599b 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -30,7 +30,6 @@ CONFIG_MIPSNET=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index f5df65f..d4807b3 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -63,7 +63,6 @@ CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy CONFIG_SERIAL_ISA=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy CONFIG_PARALLEL=3Dy CONFIG_I82374=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 651fe1a..3f7fbe2 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index fa3e07e..17f07a4 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -11,7 +11,6 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I8259=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index 24d7389..2d23b0c 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -14,7 +14,6 @@ CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index dedb513..01aea55 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -35,6 +35,8 @@ config HDA =20 config PCSPK bool + default y + depends on I8254 =20 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index b60e2ab..6a23659 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,7 @@ config FDC bool + default y + depends on ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 6eba69a..fc18481 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -3,6 +3,8 @@ config ESCC =20 config PARALLEL bool + default y + depends on ISA_BUS =20 config PL011 bool @@ -12,11 +14,15 @@ config SERIAL =20 config SERIAL_ISA bool + default y + depends on ISA_BUS + select SERIAL =20 config SERIAL_PCI bool default y if PCI_DEVICES depends on PCI + select SERIAL =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 9199beb..e5f347f 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -39,9 +39,12 @@ config VGA_PCI =20 config VGA_ISA bool + depends on ISA_BUS + select VGA =20 config VGA_ISA_MM bool + select VGA =20 config VMWARE_VGA bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index b9ce1c5..751dec5 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -9,6 +9,7 @@ config PL330 =20 config I82374 bool + select I8257 =20 config I8257 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 6df3f7c..0f94ae1 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -13,6 +13,7 @@ config I440FX =20 config ISAPC bool + select ISA_BUS =20 config Q35 bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 246e27b..ab47b6a 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -12,6 +12,7 @@ config IDE_PCI =20 config IDE_ISA bool + depends on ISA_BUS select IDE_QDEV =20 config IDE_PIIX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index c729dcd..814f87f 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -6,6 +6,8 @@ config LM832X =20 config PCKBD bool + default y + depends on ISA_BUS =20 config PL050 bool diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1..6a4f08f 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -9,6 +9,8 @@ config IPMI_EXTERN =20 config ISA_IPMI_KCS bool + depends on ISA_BUS =20 config ISA_IPMI_BT bool + depends on ISA_BUS diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index b59d074..af68af9 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -6,18 +6,25 @@ config APM =20 config I82378 bool + select ISA_BUS =20 config PC87312 bool + select ISA_BUS =20 config PIIX4 bool + select ISA_BUS =20 config VT82C686 bool + select ISA_BUS =20 config SMC37C669 bool + select ISA_BUS =20 config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 830b457..5a7dbe1 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + depends on ISA_BUS =20 config MAX111X bool @@ -12,12 +13,16 @@ config TMP421 =20 config ISA_DEBUG bool + depends on ISA_BUS =20 config SGA bool + depends on ISA_BUS =20 config ISA_TESTDEV bool + default y if TEST_DEVICES + depends on ISA_BUS =20 config PCI_TESTDEV bool @@ -93,6 +98,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + depends on ISA_BUS =20 config AUX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d50e301..ff974bc 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -48,6 +48,10 @@ config LAN9118 =20 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State + select NE2000_PCI =20 config OPENCORES_ETH bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 8c13345..41f7295 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,6 @@ config SUN4U bool + select ISA_BUS =20 config NIAGARA bool diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index da4bb5b..f3eb570 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -3,7 +3,7 @@ config TPM =20 config TPM_TIS bool - depends on TPM + depends on TPM && ISA_BUS =20 config TPM_CRB bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index edb3d42..35ccb72 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -8,6 +8,8 @@ config WDT_IB6300ESB =20 config WDT_IB700 bool + default y + depends on ISA_BUS =20 config WDT_DIAG288 bool --=20 1.8.3.1