From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:46081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCs-0002Ek-0I for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCo-0004Zh-74 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:51 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCn-0004SC-Sg for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wr1-x42c.google.com with SMTP id w2so6626058wrt.11 for ; Mon, 04 Mar 2019 10:20:47 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 4 Mar 2019 19:19:51 +0100 Message-Id: <1551723614-1823-32-git-send-email-pbonzini@redhat.com> In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 31/54] i386-softmmu.mak: remove all CONFIG_* except boards definitions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: thuth@redhat.com, Yang Zhong From: Yang Zhong %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-43-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 37 ++++++++++++++++++------------------- hw/acpi/Kconfig | 6 ++++++ hw/i386/Kconfig | 15 +++++++++++++++ hw/mem/Kconfig | 2 ++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index e779ee1..ba3fb3f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,25 +1,24 @@ # Default configuration for i386-softmmu -CONFIG_VMXNET3_PCI=y -CONFIG_ISA_IPMI_KCS=y -CONFIG_ISA_IPMI_BT=y - -# Optional devices: +# Uncomment the following lines to disable these optional devices: # -CONFIG_HPET=y -CONFIG_APPLESMC=y -CONFIG_PFLASH_CFI01=y -CONFIG_ISA_DEBUG=y -CONFIG_ISA_TESTDEV=y -CONFIG_TEST_DEVICES=y -CONFIG_SGA=y -CONFIG_PVPANIC=y -CONFIG_MEM_DEVICE=y -CONFIG_NVDIMM=y -CONFIG_ACPI_NVDIMM=y -CONFIG_PXB=y -CONFIG_ACPI_VMGENID=y -CONFIG_PCI_DEVICES=y +#CONFIG_AMD_IOMMU=n +#CONFIG_APPLESMC=n +#CONFIG_FDC=n +#CONFIG_HPET=n +#CONFIG_HYPERV=n +#CONFIG_ISA_DEBUG=n +#CONFIG_ISA_IPMI_BT=n +#CONFIG_ISA_IPMI_KCS=n +#CONFIG_PCI_DEVICES=n +#CONFIG_PVPANIC=n +#CONFIG_QXL=n +#CONFIG_SEV=n +#CONFIG_SGA=n +#CONFIG_TEST_DEVICES=n +#CONFIG_TPM_CRB=n +#CONFIG_TPM_TIS=n +#CONFIG_VTD=n # Boards: # diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 035a28f..eca3bee 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -4,6 +4,9 @@ config ACPI config ACPI_X86 bool select ACPI + select ACPI_NVDIMM + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG config ACPI_X86_ICH bool @@ -18,6 +21,9 @@ config ACPI_MEMORY_HOTPLUG config ACPI_NVDIMM bool + depends on ACPI config ACPI_VMGENID bool + default y + depends on PC diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index ea72f48..78fd703 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -4,18 +4,32 @@ config SEV config PC bool + imply APPLESMC imply HYPERV + imply ISA_IPMI_KCS + imply ISA_IPMI_BT + imply ISA_DEBUG + imply PCI_DEVICES + imply PVPANIC imply QXL imply SEV + imply SGA + imply TEST_DEVICES imply TPM_CRB imply TPM_TIS select FDC select I8259 select I8254 + select PCKBD select PCSPK select I82374 select I8257 select MC146818RTC + # Needed by the board code: + select PARALLEL + # For ACPI builder: + select SERIAL_ISA + select ACPI_VMGENID config PC_PCI bool @@ -30,6 +44,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS config I440FX diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372..d1e635c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE config NVDIMM bool + default y + depends on PC diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index 0519eb1..b167b98 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT config PXB bool + default y if Q35 config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c74..51921eb 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 config HPET bool + default y if PC config I8254 bool -- 1.8.3.1