[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 29/51] i386-softmmu.mak: remove all CONFIG_* except
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 29/51] i386-softmmu.mak: remove all CONFIG_* except boards definitions |
Date: |
Thu, 7 Feb 2019 18:57:12 +0100 |
From: Yang Zhong <address@hidden>
%-softmmu.mak only keep boards definitions in Kconfig mode.
Signed-off-by: Yang Zhong <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 b9d9168..790d37e 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -4,17 +4,31 @@ 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 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
@@ -29,6 +43,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
- Re: [Qemu-devel] [PATCH 05/51] kconfig: introduce kconfig files, (continued)
- [Qemu-devel] [PATCH 20/51] display: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 27/51] sd: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 28/51] ipmi: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 22/51] vfio: express vfio dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 23/51] virtio: express virtio dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 25/51] isa: express SuperIO dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 26/51] ssi: express dependencies with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 29/51] i386-softmmu.mak: remove all CONFIG_* except boards definitions,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 31/51] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 30/51] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 32/51] ppc: Express dependencies of the Mac machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 33/51] ppc: Express dependencies of the Sam460EX machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 34/51] ppc: Express dependencies of the embedded machines with kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 35/51] alpha-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07
- [Qemu-devel] [PATCH 39/51] m68k-softmmu.mak: express dependencies with Kconfig, Paolo Bonzini, 2019/02/07