@@ -1,27 +1,5 @@
# Default configuration for i386-softmmu
-CONFIG_VMXNET3_PCI=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
-CONFIG_ISA_IPMI_KCS=y
-CONFIG_ISA_IPMI_BT=y
-
-# Optional devices:
-#
-CONFIG_HPET=y
-CONFIG_APPLESMC=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_ISA_TESTDEV=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_SEV=$(CONFIG_KVM)
-
# Boards:
#
CONFIG_ISAPC=y
@@ -18,9 +18,14 @@ config ACPI_MEMORY_HOTPLUG
config ACPI_NVDIMM
bool
+ default y
+ depends on PC || Q35
config ACPI_VMGENID
bool
+ default y
+ depends on PC || Q35
config IPMI
bool
+ depends on PC
@@ -1,6 +1,10 @@
config KVM
bool
+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
config I440FX
@@ -3,12 +3,20 @@ config IPMI
config IPMI_LOCAL
bool
+ default y
+ depends on IPMI
config IPMI_EXTERN
bool
+ default y
+ depends on IPMI
config ISA_IPMI_KCS
bool
+ default y if PC
+ select IPMI
config ISA_IPMI_BT
bool
+ default y if PC
+ select IPMI
@@ -6,3 +6,5 @@ config MEM_DEVICE
config NVDIMM
bool
+ default y
+ depends on PC || Q35
@@ -1,5 +1,6 @@
config APPLESMC
bool
+ default y if PC
depends on ISA_BUS
config MAX111X
@@ -19,10 +20,12 @@ config ISA_DEBUG
config SGA
bool
+ default y if PC
depends on ISA_BUS
config ISA_TESTDEV
bool
+ default y if PC
config PCI_TESTDEV
bool
@@ -99,6 +102,7 @@ config IOTKIT_SYSINFO
config PVPANIC
bool
+ default y if PC
depends on ISA_BUS
config AUX
@@ -5,6 +5,7 @@ config PCIE_PORT
config PXB
bool
+ default y if PC
config XIO3130
bool
@@ -15,6 +15,7 @@ config DS1338
config HPET
bool
+ default y if PC
config I8254
bool
%-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong <yang.zhong@intel.com> --- 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(-)