From nobody Fri Jun 28 05:05:04 2024 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; 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=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548228976446495.68862798976716; Tue, 22 Jan 2019 23:36:16 -0800 (PST) Received: from localhost ([127.0.0.1]:57305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmD50-0006UL-Fw for importer@patchew.org; Wed, 23 Jan 2019 02:36:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCWb-0005Hf-RW for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmCWZ-0003xr-MW for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:37 -0500 Received: from mga18.intel.com ([134.134.136.126]:36924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmCWX-0002Nr-1M for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:35 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2019 22:59:38 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga001.jf.intel.com with ESMTP; 22 Jan 2019 22:59:36 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,510,1539673200"; d="scan'208";a="129981021" From: Yang Zhong To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:56:09 +0800 Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123065618.3520-1-yang.zhong@intel.com> References: <20190123065618.3520-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [RFC PATCH v4 35/44] 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@intel.com, peter.maydell@linaro.org, thuth@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, sameo@linux.intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth --- default-configs/i386-softmmu.mak | 9 --------- hw/audio/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 6 ++++++ hw/display/Kconfig | 3 +++ hw/i386/Kconfig | 1 + hw/ide/Kconfig | 1 + hw/input/Kconfig | 2 ++ hw/isa/Kconfig | 5 +++++ hw/misc/Kconfig | 4 ++++ hw/net/Kconfig | 3 +++ hw/watchdog/Kconfig | 2 ++ 12 files changed, 31 insertions(+), 9 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 37b5bf4c77..d818796840 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -7,19 +7,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 @@ -29,14 +22,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/hw/audio/Kconfig b/hw/audio/Kconfig index bfb30276ec..350f2d4359 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -35,6 +35,8 @@ config HDA =20 config PCSPK bool + default y + depends on ISA_BUS =20 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 3710434436..83c2be5915 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 1ed6f0dbce..56c1177f95 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 depends on PCI + select SERIAL =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 6bcfc10bcb..a53ca4601a 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/i386/Kconfig b/hw/i386/Kconfig index 427bda3717..68a9064558 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -9,6 +9,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 3778580df2..fb15211379 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 91bae47498..01805ed17b 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/isa/Kconfig b/hw/isa/Kconfig index b59d074453..3f451ef006 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -9,15 +9,20 @@ config I82378 =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 =20 config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 1ca4b2464e..e6df7480c6 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,9 +13,11 @@ config TMP421 =20 config ISA_DEBUG bool + depends on ISA_BUS =20 config SGA bool + depends on ISA_BUS =20 config ISA_TESTDEV bool @@ -93,6 +96,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 887c596f70..82619327f9 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -48,6 +48,9 @@ config LAN9118 =20 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State =20 config OPENCORES_ETH bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 4e24bf8240..b5cd056b01 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 2.17.1