From nobody Sat Sep 28 15:08:08 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548228963469891.1829888762733; Tue, 22 Jan 2019 23:36:03 -0800 (PST) Received: from localhost ([127.0.0.1]:57303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmD4i-0006Jd-75 for importer@patchew.org; Wed, 23 Jan 2019 02:35:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCWv-0005W4-Pk for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmCWu-00048L-MW for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:57 -0500 Received: from mga18.intel.com ([134.134.136.126]:36919) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmCWu-0002Mh-D1 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:00:56 -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:53 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga001.jf.intel.com with ESMTP; 22 Jan 2019 22:59:51 -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="129981121" From: Yang Zhong To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:56:16 +0800 Message-Id: <20190123065618.3520-43-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 42/44] i386-softmmu.mak: remove all CONFIG_* except boards definitions 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" %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong --- default-configs/i386-softmmu.mak | 22 ---------------------- hw/acpi/Kconfig | 5 +++++ hw/i386/Kconfig | 5 +++++ hw/ipmi/Kconfig | 8 ++++++++ hw/mem/Kconfig | 2 ++ hw/misc/Kconfig | 4 ++++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 8 files changed, 26 insertions(+), 22 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 992aea8f30..7b083412af 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,27 +1,5 @@ # Default configuration for i386-softmmu =20 -CONFIG_VMXNET3_PCI=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy -CONFIG_ISA_IPMI_KCS=3Dy -CONFIG_ISA_IPMI_BT=3Dy - -# Optional devices: -# -CONFIG_HPET=3Dy -CONFIG_APPLESMC=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_ISA_TESTDEV=3Dy -CONFIG_SGA=3Dy -CONFIG_PVPANIC=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_NVDIMM=3Dy -CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PXB=3Dy -CONFIG_ACPI_VMGENID=3Dy -CONFIG_SEV=3D$(CONFIG_KVM) - # Boards: # CONFIG_ISAPC=3Dy diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 98bb3539e1..1b9b56e4fd 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -18,9 +18,14 @@ config ACPI_MEMORY_HOTPLUG =20 config ACPI_NVDIMM bool + default y + depends on PC || Q35 =20 config ACPI_VMGENID bool + default y + depends on PC || Q35 =20 config IPMI bool + depends on PC diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 6fa943380c..273fc88daa 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,6 +1,10 @@ config KVM bool =20 +config SEV + bool + default y if PC && KVM + config PC bool select ISA_DEBUG @@ -25,6 +29,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1a54..b15c7b3edc 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -3,12 +3,20 @@ config IPMI =20 config IPMI_LOCAL bool + default y + depends on IPMI =20 config IPMI_EXTERN bool + default y + depends on IPMI =20 config ISA_IPMI_KCS bool + default y if PC + select IPMI =20 config ISA_IPMI_BT bool + default y if PC + select IPMI diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372fa7..a2f8ce9079 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE =20 config NVDIMM bool + default y + depends on PC || Q35 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 73ceefab75..6fb1c0ca22 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + default y if PC depends on ISA_BUS =20 config MAX111X @@ -19,10 +20,12 @@ config ISA_DEBUG =20 config SGA bool + default y if PC depends on ISA_BUS =20 config ISA_TESTDEV bool + default y if PC =20 config PCI_TESTDEV bool @@ -99,6 +102,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + default y if PC depends on ISA_BUS =20 config AUX diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index c8ccf71259..067861ade4 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT =20 config PXB bool + default y if PC =20 config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c742de..51921eb63f 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 =20 config HPET bool + default y if PC =20 config I8254 bool --=20 2.17.1