Commit 58accbc5 authored by Yang Zhong's avatar Yang Zhong Committed by Paolo Bonzini
Browse files

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



%-softmmu.mak only keep boards definitions in Kconfig mode.

Signed-off-by: default avatarYang Zhong <yang.zhong@intel.com>
Message-Id: <20190123065618.3520-43-yang.zhong@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dd2356e5

default-configs/i386-softmmu.mak

+18 −19
Original line number Diff line number Diff line 
# 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:

#

hw/acpi/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -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

hw/i386/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -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

hw/mem/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -6,3 +6,5 @@ config MEM_DEVICE 


config NVDIMM

    bool

    default y

    depends on PC

hw/pci-bridge/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config PCIE_PORT 


config PXB

    bool

    default y if Q35



config XIO3130

    bool