diff options
| author | Yang Zhong <yang.zhong@intel.com> | 2019-01-23 14:56:16 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | 58accbc508e123f20829ca95a306dd43ecbd0313 (patch) | |
| tree | 58f748c6847b06a0107ef5e8dbf7983625f408e9 /hw | |
| parent | dd2356e5316eae78876602a57608e33e2de85e11 (diff) | |
i386-softmmu.mak: remove all CONFIG_* except boards definitions
%-softmmu.mak only keep boards definitions in Kconfig mode.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <20190123065618.3520-43-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/Kconfig | 6 | ||||
| -rw-r--r-- | hw/i386/Kconfig | 15 | ||||
| -rw-r--r-- | hw/mem/Kconfig | 2 | ||||
| -rw-r--r-- | hw/pci-bridge/Kconfig | 1 | ||||
| -rw-r--r-- | hw/timer/Kconfig | 1 |
5 files changed, 25 insertions, 0 deletions
diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 035a28f751..eca3beed75 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 ea72f4888a..78fd70396a 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 a3a4372fa7..d1e635c9a7 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 0519eb1f67..b167b98497 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 a021c742de..51921eb63f 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 |