mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i386-softmmu.mak: remove all CONFIG_* except boards definitions

Browse Source 
%-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>
This commit is contained in:
Yang Zhong 2019-01-23 14:56:16 +08:00 committed by Paolo Bonzini
parent dd2356e531
commit 58accbc508
6 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
default-configs/i386-softmmu.mak
View File

@ -1,25 +1,24 @@
# Default configuration for i386-softmmu # Default configuration for i386-softmmu
CONFIG_VMXNET3_PCI=y # Uncomment the following lines to disable these optional devices:
CONFIG_ISA_IPMI_KCS=y
CONFIG_ISA_IPMI_BT=y
# Optional devices:
# #
CONFIG_HPET=y #CONFIG_AMD_IOMMU=n
CONFIG_APPLESMC=y #CONFIG_APPLESMC=n
CONFIG_PFLASH_CFI01=y #CONFIG_FDC=n
CONFIG_ISA_DEBUG=y #CONFIG_HPET=n
CONFIG_ISA_TESTDEV=y #CONFIG_HYPERV=n
CONFIG_TEST_DEVICES=y #CONFIG_ISA_DEBUG=n
CONFIG_SGA=y #CONFIG_ISA_IPMI_BT=n
CONFIG_PVPANIC=y #CONFIG_ISA_IPMI_KCS=n
CONFIG_MEM_DEVICE=y #CONFIG_PCI_DEVICES=n
CONFIG_NVDIMM=y #CONFIG_PVPANIC=n
CONFIG_ACPI_NVDIMM=y #CONFIG_QXL=n
CONFIG_PXB=y #CONFIG_SEV=n
CONFIG_ACPI_VMGENID=y #CONFIG_SGA=n
CONFIG_PCI_DEVICES=y #CONFIG_TEST_DEVICES=n
#CONFIG_TPM_CRB=n
#CONFIG_TPM_TIS=n
#CONFIG_VTD=n
# Boards: # Boards:
# #

6
hw/acpi/Kconfig
View File

@ -4,6 +4,9 @@ config ACPI
config ACPI_X86 config ACPI_X86
bool bool
select ACPI select ACPI
select ACPI_NVDIMM
select ACPI_CPU_HOTPLUG
select ACPI_MEMORY_HOTPLUG
config ACPI_X86_ICH config ACPI_X86_ICH
bool bool
@ -18,6 +21,9 @@ config ACPI_MEMORY_HOTPLUG
config ACPI_NVDIMM config ACPI_NVDIMM
bool bool
depends on ACPI
config ACPI_VMGENID config ACPI_VMGENID
bool bool
default y
depends on PC

15
hw/i386/Kconfig
View File

@ -4,18 +4,32 @@ config SEV
config PC config PC
bool bool
imply APPLESMC
imply HYPERV imply HYPERV
imply ISA_IPMI_KCS
imply ISA_IPMI_BT
imply ISA_DEBUG
imply PCI_DEVICES
imply PVPANIC
imply QXL imply QXL
imply SEV imply SEV
imply SGA
imply TEST_DEVICES
imply TPM_CRB imply TPM_CRB
imply TPM_TIS imply TPM_TIS
select FDC select FDC
select I8259 select I8259
select I8254 select I8254
select PCKBD
select PCSPK select PCSPK
select I82374 select I82374
select I8257 select I8257
select MC146818RTC select MC146818RTC
# Needed by the board code:
select PARALLEL
# For ACPI builder:
select SERIAL_ISA
select ACPI_VMGENID
config PC_PCI config PC_PCI
bool bool
@ -30,6 +44,7 @@ config PC_ACPI
select ACPI_CPU_HOTPLUG select ACPI_CPU_HOTPLUG
select ACPI_MEMORY_HOTPLUG select ACPI_MEMORY_HOTPLUG
select SMBUS_EEPROM select SMBUS_EEPROM
select PFLASH_CFI01
depends on ACPI_SMBUS depends on ACPI_SMBUS
config I440FX config I440FX

2
hw/mem/Kconfig
View File

@ -6,3 +6,5 @@ config MEM_DEVICE
config NVDIMM config NVDIMM
bool bool
default y
depends on PC

1
hw/pci-bridge/Kconfig
View File

@ -5,6 +5,7 @@ config PCIE_PORT
config PXB config PXB
bool bool
default y if Q35
config XIO3130 config XIO3130
bool bool

1
hw/timer/Kconfig
View File

@ -15,6 +15,7 @@ config DS1338
config HPET config HPET
bool bool
default y if PC
config I8254 config I8254
bool bool